aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.7->trunkMatthew Wild2010-05-233-9/+26
|\
| * usermanager: Take datamanager errors into account when determining account ex...Waqas Hussain2010-05-241-1/+2
| * rostermanager: Return an error string when subscription test fails due to an ...Waqas Hussain2010-05-241-2/+2
| * rostermanager: Mark rosters which fail to load as broken, and never save them.Waqas Hussain2010-05-241-1/+2
| * rostermanager: Correctly clear the bare_sessions table on roster load errors ...Waqas Hussain2010-05-231-1/+1
| * rostermanager: Don't fire roster-load event if there was an error loading the...Matthew Wild2010-05-221-1/+3
| * sessionmanager: Change error for reaching resource limit from 'conflict' to '...Waqas Hussain2010-05-221-1/+1
| * sessionmanager: If roster loading fails during resource bind, kick the user w...Waqas Hussain2010-05-221-1/+13
| * rostermanager: When loading the roster, also return a datamanager error if av...Waqas Hussain2010-05-221-2/+3
* | Merge 0.7->trunkMatthew Wild2010-05-201-2/+4
|\|
| * usermanager, mod_saslauth: Make account provisioning for Cyrus SASL optional ...Matthew Wild2010-05-201-2/+4
| * Merge with 0.6Matthew Wild2010-05-171-1/+1
| |\
| | * loggingmanager: Enable debug level for default console logging when 'debug' m...Waqas Hussain2010-05-061-1/+1
* | | usermanager: Changed auth provider functions to methods.Waqas Hussain2010-05-191-14/+14
* | | usermanager: Export new_default_provider()Matthew Wild2010-05-151-0/+2
* | | usermanager: Handle auth providers for components.Waqas Hussain2010-05-131-2/+4
* | | usermanager: Fix logic for per-host admin tables (thanks Maranda)Matthew Wild2010-05-121-6/+8
* | | usermanager: Bump log level of incorrect config option warningsMatthew Wild2010-05-071-2/+2
* | | usermanager: Fix for is_admin to work with the new auth provider architectureMatthew Wild2010-05-071-7/+16
* | | Merge 0.7->trunkWaqas Hussain2010-05-061-1/+1
|\ \ \
| * | | loggingmanager: Enable debug level for default console logging when 'debug' m...Waqas Hussain2010-05-061-1/+1
| |/ /
* | | Merge configmanager->trunkMatthew Wild2010-05-051-3/+4
|\ \ \
| * | | configmanager: Add VirtualHost as an alias for Host (re-applied in trunk due ...Matthew Wild2010-04-141-3/+3
* | | | usermanager: Give the default auth provider a name, you'll never guess what i...Matthew Wild2010-05-051-1/+1
* | | | usermanager: Support for pluggable authentication providersMatthew Wild2010-05-051-48/+83
* | | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step to...Matthew Wild2010-05-041-11/+5
* | | | Merge 0.7->trunk (with MUC needing checking, waqas)Matthew Wild2010-05-042-4/+12
|\ \ \ \ | | |/ / | |/| |
| * | | Merge 0.6 into 0.7.Waqas Hussain2010-05-012-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | hostmanager: Re-word log messages in line with config changesMatthew Wild2010-04-141-3/+3
| | * | configmanager: Add VirtualHost as an alias for HostMatthew Wild2010-04-141-3/+3
| * | | modulemanager: Log proper tracebacks on errors during module load/unload.Waqas Hussain2010-04-191-1/+9
* | | | configmanager: Fix very wacky indentationMatthew Wild2010-05-041-10/+13
* | | | configmanager: Fix some wacky indentationMatthew Wild2010-05-041-4/+5
| |_|/ |/| |
* | | loggingmanager: Fix syntax error :)Matthew Wild2010-04-071-1/+1
* | | loggingmanager: Observe 'debug' config setting for console logging tooMatthew Wild2010-04-071-1/+1
|/ /
* | Merge 0.6->0.7Matthew Wild2010-03-303-10/+7
|\|
| * stanza_router, s2smanager, modulemanager: Fix for handling of the default nam...Matthew Wild2010-03-303-10/+7
* | usermanager: Added function set_password.Waqas Hussain2010-03-241-0/+9
* | usermanager: Return sane errors/results when Cyrus SASL is in use.Waqas Hussain2010-03-231-1/+8
* | Merge 0.6->0.7Matthew Wild2010-03-2213-27/+27
|\|
| * Update copyright headers for 2010Matthew Wild2010-03-2215-30/+30
| * loggingmanager: Don't use non-standard format specifier to format the timestamp.Waqas Hussain2010-03-221-1/+1
* | stanza_router: Don't send error replies for stanzas of type 'error' and 'resu...Waqas Hussain2010-03-221-1/+3
* | stanza_router: Allow non-jabber:client elements after auth, before bind. [ori...Waqas Hussain2010-03-221-1/+1
* | sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fi...Matthew Wild2010-03-222-0/+2
* | rostermanager: Don't bump the roster version if it is == true (ie. we are not...Matthew Wild2010-03-221-2/+8
* | Merge 0.6->0.7Matthew Wild2010-03-181-5/+0
|\|
| * s2smanager: Remove the infamous 'as per RFC' log message entirely (it happens...Matthew Wild2010-03-181-6/+0
| * Merge 0.6.2/waqas with 0.6.2/MattJMatthew Wild2010-03-036-10/+44
| |\
| | * stanza_router: Don't send error replies for stanzas of type 'error' and 'resu...Waqas Hussain2010-03-041-1/+3