Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL ↵ | Kim Alvefur | 2014-09-23 | 2 | -12/+2 |
| | | | | | | | | EXTERNAL failure | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-09-23 | 3 | -6/+8 |
|\| | |||||
| * | core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r) | Kim Alvefur | 2014-09-23 | 2 | -2/+4 |
| | | |||||
| * | util.random: Ensure at least 4 bytes of previous random state is used when ↵ | Kim Alvefur | 2014-09-18 | 1 | -2/+2 |
| | | | | | | | | generating new randomness | ||||
| * | util.random: Switch to SHA512 | Kim Alvefur | 2014-09-18 | 1 | -2/+2 |
| | | |||||
* | | plugins/muc/muc.lib: Fix iq results coming from the real jid, not the ↵ | daurnimator | 2014-09-16 | 1 | -1/+1 |
| | | | | | | | | in-room jid (thanks Lance) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-09-18 | 10 | -29/+57 |
|\| | |||||
| * | util.array: Add type() local | Kim Alvefur | 2014-09-17 | 1 | -0/+1 |
| | | |||||
| * | prosody: Fix getfenv replacement for Lua 5.2 | Kim Alvefur | 2014-09-17 | 1 | -1/+6 |
| | | |||||
| * | core.modulemanager, core.moduleapi: Hack around dependency loop | Kim Alvefur | 2014-09-17 | 2 | -3/+6 |
| | | |||||
| * | core.moduleapi: Use require instead of global to get storagemanager in ↵ | Kim Alvefur | 2014-09-17 | 1 | -1/+2 |
| | | | | | | | | module:open_store() | ||||
| * | util-src/*.c: Add macro for compiling with Lua 5.2 | Kim Alvefur | 2014-09-17 | 6 | -0/+24 |
| | | |||||
| * | util-src/*.c: Use the more concise lua_setfield | Kim Alvefur | 2014-09-17 | 4 | -13/+7 |
| | | |||||
| * | util-src/*.c: Don't create globals when loaded | Kim Alvefur | 2014-09-16 | 6 | -11/+11 |
| | | |||||
* | | plugins/muc/muc.lib: Allow plugins to reject broadcasts in the ↵ | daurnimator | 2014-09-16 | 1 | -1/+4 |
| | | | | | | | | muc-broadcast-message event. | ||||
* | | plugins/mod_muc_unique: Fix undefined global access (thanks Lance) | Waqas Hussain | 2014-09-16 | 1 | -1/+2 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2014-09-11 | 31 | -1223/+3545 |
|\ \ | |/ |/| | |||||
| * | util.vcard: Turn PHOTO fields into data-uris | Kim Alvefur | 2014-09-10 | 1 | -1/+5 |
| | |