aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.7->trunkMatthew Wild2010-03-246-104/+120
|\
| * Merge 0.7/waqas->0.7/MattJMatthew Wild2010-03-243-4/+12
| |\
| | * util.sasl.digest-md5: Removed unnnecessary check (which included a nil global...Waqas Hussain2010-03-241-2/+0
| | * mod_register: Use set_password to set passwords instead of create_user.Waqas Hussain2010-03-241-2/+3
| | * usermanager: Added function set_password.Waqas Hussain2010-03-241-0/+9
| * | Merge 0.6->0.7Matthew Wild2010-03-241-2/+3
| |\ \ | | |/ | |/|
| | * mod_tls: Add s2s_allow_encryption option which, when set to false, disabled T...Matthew Wild2010-03-241-18/+27
| * | prosody.cfg.lua.dist: Whitespace fix.Waqas Hussain2010-03-231-89/+89
| * | prosody.cfg.lua.dist: Disable mod_privacy by default.Waqas Hussain2010-03-231-1/+1
| * | usermanager: Return sane errors/results when Cyrus SASL is in use.Waqas Hussain2010-03-231-1/+8
| * | mod_saslauth: Tidier code for SASL backend selection.Waqas Hussain2010-03-231-8/+6
| * | mod_saslauth: Fail with an error when the requested SASL backend cannot be used.Waqas Hussain2010-03-231-4/+6
* | | Merge 0.7->trunkMatthew Wild2010-03-2298-240/+260
|\| |
| * | Merge 0.6->0.7Matthew Wild2010-03-2297-238/+258
| |\|
| | * util.windows: Convert from Windows line endingsMatthew Wild2010-03-221-58/+58
| | * Update copyright headers for 2010Matthew Wild2010-03-22100-199/+212
| | * loggingmanager: Don't use non-standard format specifier to format the timestamp.Waqas Hussain2010-03-221-1/+1
* | | util.xmppstream: new() now returns a parser objectMatthew Wild2010-03-221-4/+9
* | | util.xmppstream: Initial commitMatthew Wild2010-03-221-0/+145
* | | Merge 0.7->trunkMatthew Wild2010-03-221-2/+4
|\| |
| * | 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
* | | Merge 0.7->trunkMatthew Wild2010-03-222-0/+2
|\| |
| * | sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fi...Matthew Wild2010-03-222-0/+2
* | | Merge 0.7->trunkMatthew Wild2010-03-222-11/+31
|\| |
| * | mod_groups: Ignore whitespace on group member JID lines (thanks Luis!)Matthew Wild2010-03-221-1/+1
| * | mod_groups: Fixes to make compatible with roster versioning - set version to ...Matthew Wild2010-03-221-0/+5
| * | mod_groups: Missed hunk from last commit, don't create the list of public gro...Matthew Wild2010-03-221-1/+1
| * | mod_groups: Only create group lists when necessary (now we can reliably detec...Matthew Wild2010-03-221-7/+16
| * | rostermanager: Don't bump the roster version if it is == true (ie. we are not...Matthew Wild2010-03-221-2/+8
| * | mod_roster: Tidier code for the roster versioning logicMatthew Wild2010-03-221-3/+4
* | | mod_roster: Tidier code for the roster versioning logicMatthew Wild2010-03-221-3/+4
* | | Merge 0.7->trunkMatthew Wild2010-03-201-0/+1
|\| |
| * | .hgignore: Ignore prosody.version (thanks Florob)Matthew Wild2010-03-201-0/+1
* | | Merge 0.7->trunkMatthew Wild2010-03-181-13/+12
|\| |
| * | util.sasl_cyrus: Return invalid-mechanism instead of undefined-condition wher...Matthew Wild2010-03-181-6/+2
| * | util.sasl_cyrus: Clarify some log messages and levelsMatthew Wild2010-03-181-3/+3
| * | util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.Paul Aurich2010-03-171-5/+8
* | | Merge 0.7->trunkMatthew Wild2010-03-180-0/+0
|\| |
| * | util.sasl_cyrus: If available, use a c14n callback for interoperability with ...Paul Aurich2010-03-171-0/+10
| * | mod_saslauth: Add a sasl_realm optionPaul Aurich2010-03-171-2/+3
| * | util.cyrus_sasl: Pass the realm to CyrusPaul Aurich2010-03-151-1/+1
* | | Merge darkrain->trunkMatthew Wild2010-03-182-2/+13
|\ \ \
| * | | util.sasl_cyrus: If available, use a c14n callback for interoperability with ...Paul Aurich2010-03-171-0/+10
| * | | mod_saslauth: Add a sasl_realm optionPaul Aurich2010-03-171-2/+3
* | | | Merge 0.7->trunkMatthew Wild2010-03-182-8/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge 0.6->0.7Matthew Wild2010-03-182-8/+3
| |\|
| | * Merge 0.6 with waqasMatthew Wild2010-03-181-3/+3
| | |\
| | | * mod_compression: Improved and lowered log level of some logged messages.Waqas Hussain2010-03-161-3/+3
| | * | s2smanager: Remove the infamous 'as per RFC' log message entirely (it happens...Matthew Wild2010-03-181-6/+0
| | |/