Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-19 | 3 | -13/+17 |
|\| | |||||
| * | s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo) | Matthew Wild | 2010-02-19 | 1 | -1/+1 |
| | | |||||
| * | net.http: Update print()s to log()s - don't ask how this came to be, I have ↵ | Matthew Wild | 2010-02-19 | 1 | -8/+7 |
| | | | | | | | | no idea :) | ||||
| * | net.httpclient_listener: Don't notify request of closed connection if the ↵ | Matthew Wild | 2010-02-19 | 1 | -1/+1 |
| | | | | | | | | close was initiated by us | ||||
| * | net.http: destroy_request(): Remove update for new server API, pass ↵ | Matthew Wild | 2010-02-19 | 1 | -2/+3 |
| | | | | | | | | request.handler instead of request.conn to ondisconnect | ||||
| * | net.http: Close connection when invalid status line is received from the server | Matthew Wild | 2010-02-19 | 1 | -1/+4 |
| | | |||||
| * | net.http: Don't re-destroy a request when the connection is closed | Matthew Wild | 2010-02-19 | 1 | -0/+1 |
| | | |||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-19 | 1 | -5/+14 |
|\| | |||||
| * | net.http: Port commit 2f235c57d713 to net.http to fix headers in responses ↵ | Matthew Wild | 2010-02-19 | 1 | -5/+14 |
| | | | | | | | | (thanks dersd) | ||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-18 | 0 | -0/+0 |
|\| | |||||
| * | MUC: Allow role changes based on JIDs. | Waqas Hussain | 2010-02-18 | 1 | -0/+3 |
| | | | | | | | | (transplanted from a4879b1e6cde5aedb6bd5827d710b6dba5e8a736) | ||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-18 | 3 | -6/+19 |
|\| | |||||
| * | README: Update URL for installation docs | Matthew Wild | 2010-02-18 | 1 | -1/+1 |
| | | |||||
| * | HACKERS: Update | Matthew Wild | 2010-02-18 | 1 | -3/+5 |
| | | |||||
| * | TODO: Update | Matthew Wild | 2010-02-18 | 1 | -2/+13 |
| | | |||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-18 | 3 | -9/+11 |
|\| | |||||
| * | net.adns: Don't treat locally-initiated disconnects as fatal with libevent ↵ | Matthew Wild | 2010-02-18 | 1 | -6/+8 |
| | | | | | | | | backend in use (thanks Flo) | ||||
| * | net.server_event: Pass false as connection error to disconnect handler if ↵ | Matthew Wild | 2010-02-18 | 1 | -1/+1 |
| | | | | | | | | close was initiated by us | ||||
| * | modulemanager: Fix traceback on unloading global modules (thanks KSid) | Matthew Wild | 2010-02-18 | 1 | -2/+2 |
| | | |||||
* | | MUC: Allow role changes based on JIDs. | Waqas Hussain | 2010-02-18 | 1 | -0/+3 |
| | | |||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-17 | 1 | -4/+4 |
|\| | |||||
| * | net.server_event: Increase SSL handshake timeout to 30s, make handshake ↵ | Matthew Wild | 2010-02-17 | 1 | -4/+4 |
| | | | | | | | | round-trip count configurable, and bump connect timeout to 20s (thanks Flo) | ||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-16 | 1 | -1/+3 |
|\| | |||||
| * | mod_tls: Only negotiate TLS on outgoing s2s connections if we have an SSL ↵ | Matthew Wild | 2010-02-16 | 1 | -1/+3 |
| | | | | | | | | context (thanks Flo...) | ||||
* | | Merge with 0.7 | Matthew Wild | 2010-02-16 | 1 | -1/+3 |
|\| | |||||
| * | net.adns: Fix potential traceback on DNS responses with libevent enabled ↵ | Matthew Wild | 2010-02-16 | 1 | -1/+3 |
| | | | | | | | | (thanks Flo) | ||||
| * | Makefile: Remove fallbacks/ | Matthew Wild | 2010-02-15 | 1 | -2/+1 |
| | | |||||
* | | Makefile: Remove fallbacks/ | Matthew Wild | 2010-02-15 | 1 | -2/+1 |
| | | |||||
* | | prosody: Don't add fallbacks to package.path and package.cpath. | Waqas Hussain | 2010-02-16 | 1 | -3/+0 |
|/ | |||||
* | util.sasl.scram: Removed unnecessary dependency on bitlib. | Waqas Hussain | 2010-02-16 | 1 | -1/+0 |
| | |||||
* | mod_saslauth: Log debug message with full error if cyrussasl couldn't be loaded | Matthew Wild | 2010-02-15 | 1 | -0/+1 |
| | |||||
* | mod_saslauth: Correct syntax for gracefully handling a missing cyrussasl library | Matthew Wild | 2010-02-15 | 1 | -2/+2 |
| | |||||
* | net.server: Remove redundant commented code and some trailing whitespace | Matthew Wild | 2010-02-15 | 1 | -2/+1 |
| | |||||
* | mod_presence: Added config option 'bare_message_delivery_policy'. Allowed ↵ | Waqas Hussain | 2010-02-15 | 1 | -11/+30 |
| | | | | values are 'priority' (default) and 'broadcast'. | ||||
* | mod_presence: Reflect the user's own presence back to them. | Waqas Hussain | 2010-02-15 | 1 | -0/+3 |
| |