Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -3/+3 | |
|\| | | | ||||||
| * | | | net.server_event: Improve and fix potential traceback in logging of new ↵ | Matthew Wild | 2010-03-01 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | incoming connections | |||||
* | | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -1/+2 | |
|\| | | | ||||||
| * | | | mod_saslauth: Add FIXME to remind myself to fix this as soon as I have time | Matthew Wild | 2010-03-01 | 1 | -1/+2 | |
| | | | | ||||||
* | | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 2 | -0/+3 | |
|\| | | | ||||||
| * | | | Merge with 0.7/waqas | Matthew Wild | 2010-03-01 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * | | | util.sasl_cyrus: Ensure the mechanisms table is available after a failed ↵ | Waqas Hussain | 2010-03-01 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | auth attempt. | |||||
| * | | | | mod_saslauth: Unlock globals while loading cyrus | Matthew Wild | 2010-03-01 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -1/+1 | |
|\| | | | | |_|_|/ |/| | | | ||||||
| * | | | prosody: Bump log message describing current connection backend to level 'info' | Matthew Wild | 2010-02-27 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-25 | 1 | -1/+1 | |
|\| | | ||||||
| * | | prosody.cfg.lua.dist: Fix missing quote in commented proxy config example | Matthew Wild | 2010-02-25 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-25 | 3 | -5/+11 | |
|\| | | ||||||
| * | | Merge with 0.6 | Matthew Wild | 2010-02-25 | 2 | -5/+7 | |
| |\| | ||||||
| | * | tests/test_core_s2smanager.lua: Fix to compare SRV weights correctly | Matthew Wild | 2010-02-25 | 1 | -4/+4 | |
| | | | ||||||
| | * | s2smanager: Log and fail gracefully when unable to create socket for ↵ | Matthew Wild | 2010-02-25 | 1 | -0/+5 | |
| | | | | | | | | | | | | outgoing s2s connection (thanks foucault) | |||||
| | * | s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain) | Matthew Wild | 2010-02-25 | 1 | -1/+3 | |
| | | | ||||||
| | * | net.adns: Trailing whitespace | Matthew Wild | 2010-01-20 | 1 | -2/+2 | |
| | | | ||||||
| | * | mod_vcard: Stricter matching of vcard stanzas with vcard_compatibility ↵ | Matthew Wild | 2009-12-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | enabled, fixes intercepting stanzas to the full JID that it shouldn't | |||||
| * | | net.server_event: Add lock_read() method to connections | Matthew Wild | 2010-02-25 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-22 | 1 | -3/+7 | |
|\| | | ||||||
| * | | prosodyctl: Fix addplugin to support --help, and hide from the help listing ↵ | Matthew Wild | 2010-02-22 | 1 | -2/+6 | |
| | | | | | | | | | | | | (for now) | |||||
| * | | prosodyctl: Fix 'restart' command to not report itself as the 'stop' command ↵ | Matthew Wild | 2010-02-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | (thanks albert!) | |||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-22 | 0 | -0/+0 | |
|\| | | ||||||
| * | | prosodyctl.man: Update email address | Dwayne Bent | 2010-02-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | prosodyctl.man: Include new restart command | Dwayne Bent | 2010-02-21 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-22 | 1 | -1/+1 | |
|\| | | ||||||
| * | | mod_console: Uncomment the help for server:shutdown() - thanks darkrain | Matthew Wild | 2010-02-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | prosodyctl.man: Update email address | Dwayne Bent | 2010-02-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | prosodyctl.man: Include new restart command | Dwayne Bent | 2010-02-21 | 1 | -0/+4 | |
| | | | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-21 | 1 | -0/+13 | |
|\| | | ||||||
| * | | prosodyctl: Add restart command for KSid and johnny :) | Matthew Wild | 2010-02-21 | 1 | -0/+13 | |
| | | | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-21 | 2 | -76/+104 | |
|\| | | ||||||
| * | | prosody.cfg.lua.dist: Update config for 0.7, most improvements from the Arch ↵ | Matthew Wild | 2010-02-21 | 1 | -75/+103 | |
| | | | | | | | | | | | | Linux package by dbb, thanks! | |||||
| * | | ejabberd2prosody: Don't print passwords of imported accounts | Matthew Wild | 2010-02-21 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge trunk with trunk | Matthew Wild | 2010-02-21 | 0 | -0/+0 | |
|\ \ \ | ||||||
| * \ \ | Merge with 0.7. | Waqas Hussain | 2010-02-21 | 2 | -0/+13 | |
| |\ \ \ | ||||||
* | \ \ \ | Merge 0.7 with 0.7 with trunk \o/ | Matthew Wild | 2010-02-21 | 2 | -0/+13 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge 0.7 with 0.7 | Matthew Wild | 2010-02-21 | 2 | -0/+13 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | mod_iq: Fire sub-events for iq/self events. | Waqas Hussain | 2010-02-21 | 1 | -0/+12 | |
| | | | | | ||||||
| | * | | | stanza_router: Make sure /self events are fired when the 'to' attribute is ↵ | Waqas Hussain | 2010-02-21 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | missing. | |||||
* | | | | | Merge with 0.7 | Matthew Wild | 2010-02-21 | 1 | -1/+1 | |
|\| | | | | |_|/ / |/| | | | ||||||
| * | | | ejabberdsql2prosody: Don't print password of imported accounts (thanks azerttyu) | Matthew Wild | 2010-02-21 | 1 | -1/+1 | |
| |/ / | ||||||
* | | | Merge with 0.7 | Matthew Wild | 2010-02-20 | 2 | -252/+0 | |
|\| | | ||||||
| * | | mod_debug: Obsoleted by mod_console | Matthew Wild | 2010-02-20 | 1 | -191/+0 | |
| | | | ||||||
| * | | mod_selftests: Obsolete, remove | Matthew Wild | 2010-02-20 | 1 | -61/+0 | |
| | | | ||||||
| * | | mod_offline: Remove from 0.7 (offline messages are handled in core at the ↵ | Matthew Wild | 2010-02-20 | 1 | -56/+0 | |
| | | | | | | | | | | | | moment) | |||||
* | | | Backed out changeset e7b09424b486 (not removing mod_offline for trunk) | Matthew Wild | 2010-02-20 | 1 | -0/+56 | |
| | | | ||||||
* | | | mod_offline: Remove from 0.7 (offline messages are handled in core at the ↵ | Matthew Wild | 2010-02-20 | 1 | -56/+0 | |
| | | | | | | | | | | | | moment) | |||||
* | | | mod_storage, plus a bit of SQL and XML. | Waqas Hussain | 2010-02-19 | 5 | -0/+594 | |
| | | |