Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-10-26 | 7 | -26/+26 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-10-26 | 3 | -15/+4 |
| |\ | |||||
| | * | Tagging 0.9.7 | Matthew Wild | 2014-10-24 | 0 | -0/+0 |
| | | | |||||
| | * | Backout changeset 6e67c73f730c: not a major fix and it breaks interop with ↵ | Matthew Wild | 2014-10-24 | 1 | -13/+2 |
| | | | | | | | | | | | | at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either. | ||||
| | * | prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks ↵ | Waqas Hussain | 2014-10-19 | 1 | -1/+1 |
| | | | | | | | | | | | | 2.2.0 no longer uses module()) | ||||
| | * | Tagging 0.9.6 | Matthew Wild | 2014-10-15 | 0 | -0/+0 |
| | | | |||||
| | * | certmanager, net.http: Disable SSLv3 by default | Matthew Wild | 2014-10-14 | 2 | -2/+2 |
| | | | |||||
| * | | mod_blocklist: Don't send unavailable presence from unavailable sessions ↵ | Kim Alvefur | 2014-10-26 | 1 | -1/+3 |
| | | | | | | | | | | | | when blocking a contact | ||||
| * | | mod_blocklist: Only log message about migrating from mod_privacy when there ↵ | Kim Alvefur | 2014-10-25 | 1 | -1/+1 |
| | | | | | | | | | | | | is data to migrate | ||||
| * | | mod_saslauth: Better name for config option | Kim Alvefur | 2014-10-21 | 1 | -1/+1 |
| | | | |||||
| * | | mod_saslauth: Make it possible to disable certain mechanisms | Kim Alvefur | 2014-10-21 | 1 | -1/+5 |
| | | | |||||
| * | | mod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted ↵ | Kim Alvefur | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | connections as it may be offered by 3rd party authentication plugins | ||||
| * | | mod_saslauth: Use a configurable set of mechanisms to not allow over ↵ | Kim Alvefur | 2014-10-21 | 1 | -2/+3 |
| | | | | | | | | | | | | unencrypted connections | ||||
| * | | mod_saslauth: Log warning if no SASL mechanisms were offered | Kim Alvefur | 2014-10-21 | 1 | -1/+5 |
| | | | |||||
| * | | mod_saslauth: Use type-specific config option getters | Kim Alvefur | 2014-10-21 | 1 | -2/+2 |
| | | | |||||
| * | | mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default ↵ | Kim Alvefur | 2014-10-21 | 3 | -4/+4 |
| | | | | | | | | | | | | option to s2s_require_encryption so the later overrides the former | ||||
| * | | prosodyctl: Add 'require_encryption' to list of deprecated options pointed ↵ | Kim Alvefur | 2014-10-21 | 1 | -1/+1 |
| | | | | | | | | | | | | out by the check command | ||||
* | | | net/server: Handle lack of util.signal correctly | daurnimator | 2014-10-22 | 1 | -4/+10 |
| | | | |||||
* | | | net/server: Remove print | daurnimator | 2014-10-22 | 1 | -1/+0 |
| | | | |||||
* | | | net.server: Rename 'server' config option to 'network_backend' (to select ↵ | Matthew Wild | 2014-10-22 | 1 | -1/+1 |
| | | | | | | | | | | | | which net.server implementation to use) | ||||
* | | | net/server: If server.hook_signal exists, overwrite signal.signal; else make ↵ | daurnimator | 2014-10-21 | 1 | -16/+18 |
| | | | | | | | | | | | | | | | | | | | | | server.hook_signal == signal.signal No longer server_event specific server.hook_signal will always exist | ||||
* | | | Move timer code out of util.timer and into relevant net.server backends | daurnimator | 2014-10-20 | 3 | -66/+65 |
| | | | |||||
* | | | net/server: Split up different backends in a nicer way. Add global config ↵ | daurnimator | 2014-10-17 | 1 | -38/+51 |
| | | | | | | | | | | | | option 'server' | ||||
* | | | plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get ↵ | daurnimator | 2014-10-17 | 1 | -7/+9 |
| | | | | | | | | | | | | restored on shutdown | ||||
* | | | plugins/muc/muc.lib: Add :each_affiliation() iterator | daurnimator | 2014-10-15 | 1 | -5/+20 |
| | | | |||||
* | | | plugins/muc/members_only: Kick non-members when members-only is turned on | daurnimator | 2014-10-15 | 1 | -0/+24 |
| | | | |||||
* | | | plugins/muc/muc.lib: Kick users from outcast hosts | daurnimator | 2014-10-15 | 1 | -2/+9 |
| | | | |||||
* | | | plugins/muc/muc.lib: Fix passing actor along as a boolean (thanks fippo) | daurnimator | 2014-10-15 | 1 | -2/+6 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-10-14 | 3 | -8/+6 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-10-14 | 2 | -2/+2 |
| |\| | |||||
| | * | mod_pubsub: Fix error type of 'forbidden' (change from 'cancel' to 'auth') | Matthew Wild | 2014-10-14 | 1 | -1/+1 |
| | | | |||||
| | * | mod_s2s: Capitalize log message | Kim Alvefur | 2014-10-10 | 1 | -1/+1 |
| | | | |||||
| * | | prosody: Make getfenv() replacement for require() sandboxing local to avoid ↵ | Kim Alvefur | 2014-10-13 | 1 | -6/+4 |
| | | | | | | | | | | | | polluting the globals table | ||||
* | | | Merge 0.10->trunk | Waqas Hussain | 2014-10-08 | 2 | -3/+14 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Waqas Hussain | 2014-10-08 | 2 | -3/+14 |
| |\| | |||||
| | * | util/dataforms: Make sure we iterate over field tags | daurnimator | 2014-10-07 | 1 | -1/+1 |
| | | | |||||
| | * | util.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. ↵ | Waqas Hussain | 2014-10-08 | 1 | -2/+13 |
| | | | | | | | | | | | | \r\n transforms into \n otherwise, and \r\n\t in attributes transforms into spaces. | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-10-05 | 4 | -9/+98 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-10-05 | 2 | -6/+11 |
| |\| | |||||
| | * | net.dns: Avoid duplicate cache entries | Florian Zeitz | 2014-10-05 | 1 | -4/+9 |
| | | | |||||
| | * | mod_admin_adhoc: Add required to field in user deletion form too | Kim Alvefur | 2014-09-29 | 1 | -1/+1 |
| | | | |||||
| | * | mod_admin_adhoc: Mark 'accountjids' field as required in 'end user sessions' ↵ | Kim Alvefur | 2014-09-29 | 1 | -1/+1 |
| | | | | | | | | | | | | command (thanks Lloyd) | ||||
| * | | mod_blocklist: Capitalize log message | Kim Alvefur | 2014-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | net.server_select: Reset read timeout timer if the event is handled | Kim Alvefur | 2014-10-03 | 1 | -0/+2 |
| | | | |||||
| * | | mod_admin_web: Add "List S2S connections" command | Florian Zeitz | 2014-09-28 | 1 | -0/+82 |
| | | | |||||
| * | | mod_admin_adhoc: Show IP in detailed version of online user listing | Florian Zeitz | 2014-09-28 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | daurnimator | 2014-09-29 | 2 | -3/+3 |
|\| | | |||||
| * | | net.websocket: Make data masking configurable | Florian Zeitz | 2014-09-26 | 2 | -3/+3 |
| | | | |||||
* | | | plugins/muc/muc.lib: Fire muc-occupant-left from other places an occupant ↵ | daurnimator | 2014-09-26 | 1 | -1/+9 |
| | | | | | | | | | | | | may leave the room | ||||
* | | | plugins/muc/muc.lib: Validate affiliations and roles to admin query get | daurnimator | 2014-09-26 | 1 | -3/+7 |
| | | |