Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2015-04-26 | 5 | -23/+18 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2015-04-26 | 1 | -12/+0 |
| |\ | |||||
| | * | net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2s | Kim Alvefur | 2015-04-24 | 1 | -12/+0 |
| | | | |||||
| * | | mod_c2s, mod_s2s: Collect statistics on number of connections | Kim Alvefur | 2015-04-26 | 2 | -0/+8 |
| | | | |||||
| * | | mod_blocklist: Some cleanup [luacheck] | Kim Alvefur | 2015-04-25 | 1 | -9/+8 |
| | | | |||||
| * | | mod_admin_adhoc: Remove special treatment of the "pending" roster entry | Kim Alvefur | 2015-04-25 | 1 | -2/+2 |
| | | | |||||
* | | | mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a ↵ | Kim Alvefur | 2015-04-05 | 1 | -0/+3 |
| | | | | | | | | | | | | top level error) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-04-03 | 2 | -11/+7 |
|\| | | |||||
| * | | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ↵ | Kim Alvefur | 2015-04-03 | 2 | -11/+7 |
| | | | | | | | | | | | | metadata field | ||||
| * | | Merge 0.9->0.10 again | Kim Alvefur | 2015-03-27 | 2 | -0/+14 |
| |\| | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-03-26 | 2 | -0/+14 |
|\ \ \ | |||||
| * \ \ | Merge 0.9->0.10 | Matthew Wild | 2015-03-26 | 2 | -0/+14 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | mod_s2s: to/from attributes are required on s2s stream headers. Set them to ↵ | Matthew Wild | 2015-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | '' when not available. Fixes #468. | ||||
| | * | mod_http: Return a static string from module:http_url() when no ports are ↵ | Kim Alvefur | 2015-03-23 | 1 | -0/+2 |
| | | | | | | | | | | | | enabled and log a warning | ||||
| | * | mod_http: Log a debug message when adding new http apps and warn if no http ↵ | Kim Alvefur | 2015-03-23 | 1 | -0/+6 |
| | | | | | | | | | | | | ports are enabled | ||||
| | * | Backout 7726b627c3ea | Kim Alvefur | 2015-03-23 | 1 | -1/+0 |
| | | | |||||
| | * | mod_http: Log event name when adding a HTTP app's hooks | Matthew Wild | 2015-03-14 | 1 | -0/+1 |
| | | | |||||
| | * | mod_admin_telnet: Require util.pposix (fixes #471) | Matthew Wild | 2015-02-20 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-03-24 | 1 | -1/+0 |
|\| | | |||||
| * | | Backed out 35ebcb733c4c | Kim Alvefur | 2015-03-23 | 1 | -1/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-01-21 | 2 | -3/+118 |
|\| | | |||||
| * | | mod_carbons: Import XEP-0280 implementation from prosody-modules (sans ↵ | Kim Alvefur | 2015-01-16 | 1 | -0/+111 |
| | | | | | | | | | | | | compat with older versions of the protocol) | ||||
| * | | mod_pep: Fire an event when an item is published | Kim Alvefur | 2014-12-20 | 1 | -3/+7 |
| | | | |||||
* | | | mod_muc: Add muc-add-history event to allow modules to override default ↵ | Matthew Wild | 2015-01-06 | 1 | -1/+8 |
| | | | | | | | | | | | | history storage | ||||
* | | | Merge 0.10 -> trunk | Waqas Hussain | 2014-12-16 | 5 | -6/+16 |
|\| | | |||||
| * | | mod_admin_telnet: Use the session-specific print function | Kim Alvefur | 2014-12-13 | 1 | -0/+1 |
| | | | |||||
| * | | mod_storage_sql2, util.sql: Set character encoding on every connect | Kim Alvefur | 2014-12-11 | 1 | -2/+0 |
| | | | |||||
| * | | mod_blocklist: Fix import | Kim Alvefur | 2014-12-09 | 1 | -1/+1 |
| | | | |||||
| * | | mod_http: Log name and base URL of HTTP apps | Kim Alvefur | 2014-12-08 | 1 | -0/+1 |
| | | | |||||
| * | | mod_bosh: Use util.async | Kim Alvefur | 2014-12-07 | 1 | -3/+13 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-22 | 1 | -7/+7 |
|\| | | |||||
| * | | certmanager, mod_tls: Return final ssl config as third return value (fix for ↵ | Kim Alvefur | 2014-11-22 | 1 | -7/+7 |
| | | | | | | | | | | | | c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-20 | 2 | -13/+27 |
|\| | | |||||
| * | | mod_tls: Keep ssl config around and attach them to sessions | Kim Alvefur | 2014-11-19 | 1 | -6/+12 |
| | | | |||||
| * | | mod_saslauth: Make it easier to support multiple channel binding methonds | Kim Alvefur | 2014-11-19 | 1 | -2/+4 |
| | | | |||||
| * | | mod_saslauth: Break out tls-unique channel binding callback so it is ↵ | Kim Alvefur | 2014-11-19 | 1 | -5/+10 |
| | | | | | | | | | | | | instantiated once | ||||
| * | | mod_saslauth: Keep sasl_handler in a local variable | Kim Alvefur | 2014-11-19 | 1 | -5/+6 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-11-20 | 1 | -1/+5 |
|\| | | |||||
| * | | mod_pubsub: Add support for including the publisher in item broadcasts | Philipp Hancke | 2014-11-20 | 1 | -1/+5 |
| | | | |||||
* | | | plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify ↵ | daurnimator | 2014-11-14 | 1 | -2/+9 |
| | | | | | | | | | | | | nick, actor, reason | ||||
* | | | plugins/muc/muc.lib: Don't expose actor jids to users when anonymous | daurnimator | 2014-11-11 | 1 | -27/+39 |
| | | | | | | | | | | | | | | | * * * plugins/muc/muc.lib: Allow event listeners to modify actor | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-09 | 2 | -1/+10 |
|\| | | |||||
| * | | mod_http: For URLs that end with / or wildcard handlers, add a low-priority ↵ | Kim Alvefur | 2014-11-04 | 1 | -0/+8 |
| | | | | | | | | | | | | redirect from without to with slash | ||||
| * | | mod_admin_telnet: Soft-reqire util.pposix for server:memory() | Kim Alvefur | 2014-10-27 | 1 | -1/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-10-26 | 4 | -10/+21 |
|\| | | |||||
| * | | 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 |