aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* util.sasl.scram: Adjusting authentication backend name to conform with the st...Tobias Markmann2010-02-281-2/+2
* util.sasl.plain: Adding plain_hashed authentication backend support.Tobias Markmann2010-02-281-1/+10
* util.sasl.scram: Adding documentation on SCRAM authentication backend.Tobias Markmann2010-02-281-0/+10
* util.sasl.anonymous: Adding documentation on anonymous authentication backend.Tobias Markmann2010-02-281-0/+10
* util.sasl: Moving SASL authentication backends documentation to the mechanism...Tobias Markmann2010-02-283-21/+30
* util.sasl: Abstracting out the hash function used since SCRAM is independent ...Tobias Markmann2010-02-281-57/+75
* Merge with 0.7Matthew Wild2010-02-251-1/+1
|\
| * prosody.cfg.lua.dist: Fix missing quote in commented proxy config exampleMatthew Wild2010-02-251-1/+1
* | Merge with 0.7Matthew Wild2010-02-253-5/+11
|\|
| * Merge with 0.6Matthew Wild2010-02-252-5/+7
| |\
| | * tests/test_core_s2smanager.lua: Fix to compare SRV weights correctlyMatthew Wild2010-02-251-4/+4
| | * s2smanager: Log and fail gracefully when unable to create socket for outgoing...Matthew Wild2010-02-251-0/+5
| | * s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain)Matthew Wild2010-02-251-1/+3
| | * net.adns: Trailing whitespaceMatthew Wild2010-01-201-2/+2
| | * mod_vcard: Stricter matching of vcard stanzas with vcard_compatibility enable...Matthew Wild2009-12-091-1/+1
| * | net.server_event: Add lock_read() method to connectionsMatthew Wild2010-02-251-0/+4
* | | Merge with 0.7Matthew Wild2010-02-221-3/+7
|\| |
| * | prosodyctl: Fix addplugin to support --help, and hide from the help listing (...Matthew Wild2010-02-221-2/+6
| * | prosodyctl: Fix 'restart' command to not report itself as the 'stop' command ...Matthew Wild2010-02-221-1/+1
* | | Merge with 0.7Matthew Wild2010-02-220-0/+0
|\| |
| * | prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
| * | prosodyctl.man: Include new restart commandDwayne Bent2010-02-211-0/+4
* | | Merge with 0.7Matthew Wild2010-02-221-1/+1
|\| |
| * | mod_console: Uncomment the help for server:shutdown() - thanks darkrainMatthew Wild2010-02-221-1/+1
* | | prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
* | | prosodyctl.man: Include new restart commandDwayne Bent2010-02-211-0/+4
* | | Merge with 0.7Matthew Wild2010-02-211-0/+13
|\| |
| * | prosodyctl: Add restart command for KSid and johnny :)Matthew Wild2010-02-211-0/+13
* | | Merge with 0.7Matthew Wild2010-02-212-76/+104
|\| |
| * | prosody.cfg.lua.dist: Update config for 0.7, most improvements from the Arch ...Matthew Wild2010-02-211-75/+103
| * | ejabberd2prosody: Don't print passwords of imported accountsMatthew Wild2010-02-211-1/+1
* | | Merge trunk with trunkMatthew Wild2010-02-210-0/+0
|\ \ \
| * \ \ Merge with 0.7.Waqas Hussain2010-02-212-0/+13
| |\ \ \
* | \ \ \ Merge 0.7 with 0.7 with trunk \o/Matthew Wild2010-02-212-0/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge 0.7 with 0.7Matthew Wild2010-02-212-0/+13
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mod_iq: Fire sub-events for iq/self events.Waqas Hussain2010-02-211-0/+12
| | * | | stanza_router: Make sure /self events are fired when the 'to' attribute is mi...Waqas Hussain2010-02-211-0/+1
* | | | | Merge with 0.7Matthew Wild2010-02-211-1/+1
|\| | | | | |_|/ / |/| | |
| * | | ejabberdsql2prosody: Don't print password of imported accounts (thanks azerttyu)Matthew Wild2010-02-211-1/+1
| |/ /
* | | Merge with 0.7Matthew Wild2010-02-202-252/+0
|\| |
| * | mod_debug: Obsoleted by mod_consoleMatthew Wild2010-02-201-191/+0
| * | mod_selftests: Obsolete, removeMatthew Wild2010-02-201-61/+0
| * | mod_offline: Remove from 0.7 (offline messages are handled in core at the mom...Matthew Wild2010-02-201-56/+0
* | | Backed out changeset e7b09424b486 (not removing mod_offline for trunk)Matthew Wild2010-02-201-0/+56
* | | mod_offline: Remove from 0.7 (offline messages are handled in core at the mom...Matthew Wild2010-02-201-56/+0
* | | mod_storage, plus a bit of SQL and XML.Waqas Hussain2010-02-195-0/+594
* | | Merge with 0.7Matthew Wild2010-02-193-13/+17
|\| |
| * | s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo)Matthew Wild2010-02-191-1/+1
| * | net.http: Update print()s to log()s - don't ask how this came to be, I have n...Matthew Wild2010-02-191-8/+7
| * | net.httpclient_listener: Don't notify request of closed connection if the clo...Matthew Wild2010-02-191-1/+1