Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.7->trunk | Matthew Wild | 2010-06-03 | 1 | -1/+0 |
|\ | |||||
| * | s2smanager: Remove potentially misleading log message (thanks albert) | Matthew Wild | 2010-06-03 | 1 | -1/+0 |
| | | |||||
* | | s2smanager: Add filters for outgoing bytes and stanzas | Matthew Wild | 2010-06-02 | 1 | -2/+29 |
| | | |||||
* | | sessionmanager: Rename filters_initialize->initialize_filters | Matthew Wild | 2010-06-02 | 1 | -2/+2 |
| | | |||||
* | | sessionmanager: Initialize new sessions for filtering, and add filters for ↵ | Matthew Wild | 2010-06-02 | 1 | -1/+14 |
| | | | | | | | | outgoing bytes and stanzas | ||||
* | | rostermanager: Optimisation to avoid unnecessarily loading rosters for ↵ | Waqas Hussain | 2010-06-01 | 1 | -0/+12 |
| | | | | | | | | offline contacts on probes, etc. | ||||
* | | Merge 0.7->trunk | Matthew Wild | 2010-05-23 | 3 | -9/+26 |
|\| | |||||
| * | usermanager: Take datamanager errors into account when determining account ↵ | Waqas Hussain | 2010-05-24 | 1 | -1/+2 |
| | | | | | | | | existance. | ||||
| * | rostermanager: Return an error string when subscription test fails due to an ↵ | Waqas Hussain | 2010-05-24 | 1 | -2/+2 |
| | | | | | | | | error. | ||||
| * | rostermanager: Mark rosters which fail to load as broken, and never save them. | Waqas Hussain | 2010-05-24 | 1 | -1/+2 |
| | | |||||
| * | rostermanager: Correctly clear the bare_sessions table on roster load errors ↵ | Waqas Hussain | 2010-05-23 | 1 | -1/+1 |
| | | | | | | | | during bind. | ||||
| * | rostermanager: Don't fire roster-load event if there was an error loading ↵ | Matthew Wild | 2010-05-22 | 1 | -1/+3 |
| | | | | | | | | the roster | ||||
| * | sessionmanager: Change error for reaching resource limit from 'conflict' to ↵ | Waqas Hussain | 2010-05-22 | 1 | -1/+1 |
| | | | | | | | | 'resource-constraint' during session bind. | ||||
| * | sessionmanager: If roster loading fails during resource bind, kick the user ↵ | Waqas Hussain | 2010-05-22 | 1 | -1/+13 |
| | | | | | | | | with an internal-server-error. | ||||
| * | rostermanager: When loading the roster, also return a datamanager error if ↵ | Waqas Hussain | 2010-05-22 | 1 | -2/+3 |
| | | | | | | | | available. | ||||
* | | Merge 0.7->trunk | Matthew Wild | 2010-05-20 | 1 | -2/+4 |
|\| | |||||
| * | usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ↵ | Matthew Wild | 2010-05-20 | 1 | -2/+4 |
| | | | | | | | | (default: not required) | ||||
| * | Merge with 0.6 | Matthew Wild | 2010-05-17 | 1 | -1/+1 |
| |\ | |||||
| | * | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | mode is enabled in the config. | ||||
* | | | usermanager: Changed auth provider functions to methods. | Waqas Hussain | 2010-05-19 | 1 | -14/+14 |
| | | | |||||
* | | | usermanager: Export new_default_provider() | Matthew Wild | 2010-05-15 | 1 | -0/+2 |
| | | | |||||
* | | | usermanager: Handle auth providers for components. | Waqas Hussain | 2010-05-13 | 1 | -2/+4 |
| | | | |||||
* | | | usermanager: Fix logic for per-host admin tables (thanks Maranda) | Matthew Wild | 2010-05-12 | 1 | -6/+8 |
| | | | |||||
* | | | usermanager: Bump log level of incorrect config option warnings | Matthew Wild | 2010-05-07 | 1 | -2/+2 |
| | | | |||||
* | | | usermanager: Fix for is_admin to work with the new auth provider architecture | Matthew Wild | 2010-05-07 | 1 | -7/+16 |
| | | | |||||
* | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | loggingmanager: Enable debug level for default console logging when 'debug' ↵ | Waqas Hussain | 2010-05-06 | 1 | -1/+1 |
| |/ / | | | | | | | | | | mode is enabled in the config. | ||||
* | | | Merge configmanager->trunk | Matthew Wild | 2010-05-05 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ↵ | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | to previous bad merge with 0.7) | ||||
* | | | | usermanager: Give the default auth provider a name, you'll never guess what ↵ | Matthew Wild | 2010-05-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | it is. | ||||
* | | | | usermanager: Support for pluggable authentication providers | Matthew Wild | 2010-05-05 | 1 | -48/+83 |
| | | | | |||||
* | | | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step ↵ | Matthew Wild | 2010-05-04 | 1 | -11/+5 |
| | | | | | | | | | | | | | | | | towards removing it entirely | ||||
* | | | | Merge 0.7->trunk (with MUC needing checking, waqas) | Matthew Wild | 2010-05-04 | 2 | -4/+12 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge 0.6 into 0.7. | Waqas Hussain | 2010-05-01 | 2 | -6/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | hostmanager: Re-word log messages in line with config changes | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
| | | | | |||||
| | * | | configmanager: Add VirtualHost as an alias for Host | Matthew Wild | 2010-04-14 | 1 | -3/+3 |
| | | | | |||||
| * | | | modulemanager: Log proper tracebacks on errors during module load/unload. | Waqas Hussain | 2010-04-19 | 1 | -1/+9 |
| | | | | |||||
* | | | | configmanager: Fix very wacky indentation | Matthew Wild | 2010-05-04 | 1 | -10/+13 |
| | | | | |||||
* | | | | configmanager: Fix some wacky indentation | Matthew Wild | 2010-05-04 | 1 | -4/+5 |
| |_|/ |/| | | |||||
* | | | loggingmanager: Fix syntax error :) | Matthew Wild | 2010-04-07 | 1 | -1/+1 |
| | | | |||||
* | | | loggingmanager: Observe 'debug' config setting for console logging too | Matthew Wild | 2010-04-07 | 1 | -1/+1 |
|/ / | |||||
* | | Merge 0.6->0.7 | Matthew Wild | 2010-03-30 | 3 | -10/+7 |
|\| | |||||
| * | stanza_router, s2smanager, modulemanager: Fix for handling of the default ↵ | Matthew Wild | 2010-03-30 | 3 | -10/+7 |
| | | | | | | | | namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted | ||||
* | | usermanager: Added function set_password. | Waqas Hussain | 2010-03-24 | 1 | -0/+9 |
| | | |||||
* | | usermanager: Return sane errors/results when Cyrus SASL is in use. | Waqas Hussain | 2010-03-23 | 1 | -1/+8 |
| | | |||||
* | | Merge 0.6->0.7 | Matthew Wild | 2010-03-22 | 13 | -27/+27 |
|\| | |||||
| * | Update copyright headers for 2010 | Matthew Wild | 2010-03-22 | 15 | -30/+30 |
| | | |||||
| * | loggingmanager: Don't use non-standard format specifier to format the timestamp. | Waqas Hussain | 2010-03-22 | 1 | -1/+1 |
| | | |||||
* | | stanza_router: Don't send error replies for stanzas of type 'error' and ↵ | Waqas Hussain | 2010-03-22 | 1 | -1/+3 |
| | | | | | | | | 'result' on unbound authenticated connections. [originally fa84451e9b35 in 0.6] | ||||
* | | stanza_router: Allow non-jabber:client elements after auth, before bind. ↵ | Waqas Hussain | 2010-03-22 | 1 | -1/+1 |
| | | | | | | | | [originally 2c538d4bde13 in 0.6] |