aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/
* | | Merge with 0.7Matthew Wild2010-03-171-10/+16
|\| |
| * | Merge with 0.6 (into 0.7, namely mod_compression fixes)Matthew Wild2010-03-171-10/+16
| |\|
| | * mod_compression: Return <setup-failed/> instead of <unsupported-method/> wher...Waqas Hussain2010-03-091-3/+5
| | * mod_compression: More robust stanza processing.Waqas Hussain2010-03-091-1/+2
| | * mod_compression: Don't succeed after indicating a failure.Waqas Hussain2010-03-091-0/+1
| | * mod_compression: Don't tell client compression succeeded when it didn't.Waqas Hussain2010-03-091-4/+4
| | * mod_compression: Fixed various possible tracebacks in logging.Waqas Hussain2010-03-091-6/+7
* | | util.cyrus_sasl: Pass the realm to CyrusPaul Aurich2010-03-151-1/+1
* | | MUC: Added support for letting clients manage discussion history.Waqas Hussain2010-03-171-7/+45
* | | Merge with 0.7 (and indirectly 0.6.2)Matthew Wild2010-03-155-36/+114
|\| |
| * | Merge 0.6.2/waqas with 0.6.2/MattJMatthew Wild2010-03-030-0/+0
| |\|
| | * Merge 0.6.2/waqas with 0.6.2/MattJMatthew Wild2010-03-0337-415/+319
| | |\
| | | * stanza_router: Don't send error replies for stanzas of type 'error' and 'resu...Waqas Hussain2010-03-041-1/+3
| | | * stanza_router: Allow non-jabber:client elements after auth, before bind.Waqas Hussain2010-03-041-1/+1
| | | * Fixing some typos.Tobias Markmann2009-11-201-4/+4
| | | * util.sasl.plain: Allow empty authzid (thanks bjc).Waqas Hussain2009-12-011-1/+1
| | | * mod_tls: Don't offer TLS on hosts that don't have any certsMatthew Wild2010-02-121-2/+4
| | | * prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
| | | * mod_console: Uncomment the help for server:shutdown() - thanks darkrainMatthew Wild2010-02-221-1/+1