Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | plugins/muc/muc.lib: Add missing :up() | daurnimator | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
* | | | plugins/muc/muc.lib: Use occupants iterator instead of assuming pairs | daurnimator | 2014-09-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-28 | 2 | -26/+21 |
|\| | | |||||
| * | | pubsub.lib: Fix variable renaming issue | Kim Alvefur | 2014-09-28 | 1 | -1/+1 |
| | | | |||||
| * | | mod_pubsub: Fix retreival of node config defaults | Kim Alvefur | 2014-09-28 | 1 | -2/+2 |
| | | | |||||
| * | | mod_pubsub: Move node config form into pubsub.lib (Thanks Florob) | Kim Alvefur | 2014-09-28 | 2 | -23/+18 |
| | | | |||||
| * | | pubsub.lib: Fix actor in configure | Kim Alvefur | 2014-09-28 | 1 | -1/+1 |
| | | | |||||
* | | | mod_pep_plus: Remove config form, it moved into pubsub.lib | Kim Alvefur | 2014-09-28 | 1 | -13/+0 |
| | | | |||||
* | | | mod_pep_plus: Default to max one item per node (Recomended for PEP) | Kim Alvefur | 2014-09-28 | 1 | -0/+4 |
| | | | |||||
* | | | mod_pep_plus: Add node config form | Kim Alvefur | 2014-09-28 | 1 | -0/+14 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-28 | 4 | -6/+113 |
|\| | | |||||
| * | | mod_pubsub: Add support for requesting default node configuration | Kim Alvefur | 2014-09-28 | 2 | -0/+9 |
| | | | |||||
| * | | mod_pubsub: Add max items to node config form | Kim Alvefur | 2014-09-28 | 1 | -0/+5 |
| | | | |||||
| * | | util.pubsub: Add support for limiting the number of item in a node (default ↵ | Kim Alvefur | 2014-09-28 | 1 | -0/+11 |
| | | | | | | | | | | | | to 20) | ||||
| * | | mod_pubsub: Add support for node configuration | Kim Alvefur | 2014-09-28 | 2 | -0/+59 |
| | | | |||||
| * | | util.pubsub: Add support for node configuration | Kim Alvefur | 2014-09-28 | 1 | -2/+22 |
| | | | |||||
| * | | util.pubsub: One less table allocated per pubsub object created | Kim Alvefur | 2014-09-28 | 1 | -3/+3 |
| | | | |||||
| * | | util.pubsub: Use local | Kim Alvefur | 2014-09-27 | 1 | -1/+1 |
| | | | |||||
| * | | mod_pubsub: Transplant pieces of cdcfd93e2f43 from trunk | Kim Alvefur | 2014-09-27 | 2 | -3/+3 |
| | | | |||||
| * | | net.server_select: When an SSL handshake is connected, if there is pending ↵ | Matthew Wild | 2014-09-26 | 1 | -0/+3 |
| | | | | | | | | | | | | data to be written to the socket, mark the socket as waiting to send (thanks daurnimator) | ||||
* | | | mod_pep_plus: Add pubsub service objects to an item list | Kim Alvefur | 2014-09-27 | 1 | -4/+7 |
| | | | |||||
* | | | muc: Add 'occupant' to muc-occupant-{joined,left,session-new} events (thanks ↵ | Matthew Wild | 2014-09-26 | 1 | -4/+8 |
| | | | | | | | | | | | | daurnimator/fippo) | ||||
* | | | hostmanager: Don't prevent host_session.send() from routing errors or iq ↵ | Matthew Wild | 2014-09-26 | 1 | -7/+0 |
| | | | | | | | | | | | | results, so modules can handle them. This code was originally added for a reason, but I can't remember what it was. | ||||
* | | | plugins/muc: Add muc-occupant-groupchat event | daurnimator | 2014-09-25 | 2 | -25/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | - Plugins can cancel messages before they are broadcast; and while they still have real from jid - Use it for subject changes - Allows for custom roles (via role_rank) - Roles are now checked before subject - Removed muc-subject-change event | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-23 | 3 | -70/+43 |
|\| | | |||||
| * | | mod_saslauth: Fix encoding of missing vs empty SASL reply messages | Kim Alvefur | 2014-09-23 | 1 | -7/+7 |
| | | | |||||
| * | | mod_s2s: Close s2s connections that can not proceed due to mod_dialback not ↵ | Kim Alvefur | 2014-09-23 | 1 | -0/+4 |
| | | | | | | | | | | | | being present | ||||
| * | | mod_saslauth: Stricter SASL EXTERNAL handling more in line with XEP-0178 | Kim Alvefur | 2014-09-23 | 1 | -51/+30 |
| | | |