aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkdaurnimator2014-09-292-3/+3
|\
| * net.websocket: Make data masking configurableFlorian Zeitz2014-09-262-3/+3
| |
* | plugins/muc/muc.lib: Fire muc-occupant-left from other places an occupant ↵daurnimator2014-09-261-1/+9
| | | | | | | | may leave the room
* | plugins/muc/muc.lib: Validate affiliations and roles to admin query getdaurnimator2014-09-261-3/+7
| |
* | plugins/muc/muc.lib: Add missing :up()daurnimator2014-09-261-1/+1
| |
* | plugins/muc/muc.lib: Use occupants iterator instead of assuming pairsdaurnimator2014-09-261-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2014-09-282-26/+21
|\|
| * pubsub.lib: Fix variable renaming issueKim Alvefur2014-09-281-1/+1
| |
| * mod_pubsub: Fix retreival of node config defaultsKim Alvefur2014-09-281-2/+2
| |
| * mod_pubsub: Move node config form into pubsub.lib (Thanks Florob)Kim Alvefur2014-09-282-23/+18
| |
| * pubsub.lib: Fix actor in configureKim Alvefur2014-09-281-1/+1
| |
* | mod_pep_plus: Remove config form, it moved into pubsub.libKim Alvefur2014-09-281-13/+0
| |
* | mod_pep_plus: Default to max one item per node (Recomended for PEP)Kim Alvefur2014-09-281-0/+4
| |
* | mod_pep_plus: Add node config formKim Alvefur2014-09-281-0/+14
| |
* | Merge 0.10->trunkKim Alvefur2014-09-284-6/+113
|\|
| * mod_pubsub: Add support for requesting default node configurationKim Alvefur2014-09-282-0/+9
| |
| * mod_pubsub: Add max items to node config formKim Alvefur2014-09-281-0/+5
| |
| * util.pubsub: Add support for limiting the number of item in a node (default ↵Kim Alvefur2014-09-281-0/+11
| | | | | | | | to 20)
| * mod_pubsub: Add support for node configurationKim Alvefur2014-09-282-0/+59
| |
| * util.pubsub: Add support for node configurationKim Alvefur2014-09-281-2/+22
| |
| * util.pubsub: One less table allocated per pubsub object createdKim Alvefur2014-09-281-3/+3
| |
| * util.pubsub: Use localKim Alvefur2014-09-271-1/+1
| |
| * mod_pubsub: Transplant pieces of cdcfd93e2f43 from trunkKim Alvefur2014-09-272-3/+3
| |
| * net.server_select: When an SSL handshake is connected, if there is pending ↵Matthew Wild2014-09-261-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 listKim Alvefur2014-09-271-4/+7
| |
* | muc: Add 'occupant' to muc-occupant-{joined,left,session-new} events (thanks ↵Matthew Wild2014-09-261-4/+8
| | | | | | | | daurnimator/fippo)
* | hostmanager: Don't prevent host_session.send() from routing errors or iq ↵Matthew Wild2014-09-261-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 eventdaurnimator2014-09-252-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->trunkKim Alvefur2014-09-233-70/+43
|\|
| * mod_saslauth: Fix encoding of missing vs empty SASL reply messagesKim Alvefur2014-09-231-7/+7
| |
| * mod_s2s: Close s2s connections that can not proceed due to mod_dialback not ↵Kim Alvefur2014-09-231-0/+4
| | | | | | | | being present
| * mod_saslauth: Stricter SASL EXTERNAL handling more in line with XEP-0178Kim Alvefur2014-09-231-51/+30
| |
| * mod_dialback, mod_saslauth: Remove broken fallback to dialback on SASL ↵Kim Alvefur2014-09-232-12/+2
| | | | | | | | EXTERNAL failure
* | Merge 0.10->trunkKim Alvefur2014-09-233-6/+8
|\|
| * core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)Kim Alvefur2014-09-232-2/+4
| |
| * util.random: Ensure at least 4 bytes of previous random state is used when ↵Kim Alvefur2014-09-181-2/+2
| | | | | | | | generating new randomness
| * util.random: Switch to SHA512Kim Alvefur2014-09-181-2/+2
| |
* | plugins/muc/muc.lib: Fix iq results coming from the real jid, not the ↵daurnimator2014-09-161-1/+1
| | | | | | | | in-room jid (thanks Lance)
* | Merge 0.10->trunkKim Alvefur2014-09-1810-29/+57
|\|
| * util.array: Add type() localKim Alvefur2014-09-171-0/+1
| |
| * prosody: Fix getfenv replacement for Lua 5.2Kim Alvefur2014-09-171-1/+6
| |
| * core.modulemanager, core.moduleapi: Hack around dependency loopKim Alvefur2014-09-172-3/+6
| |
| * core.moduleapi: Use require instead of global to get storagemanager in ↵Kim Alvefur2014-09-171-1/+2
| | | | | | | | module:open_store()
| * util-src/*.c: Add macro for compiling with Lua 5.2Kim Alvefur2014-09-176-0/+24
| |
| * util-src/*.c: Use the more concise lua_setfieldKim Alvefur2014-09-174-13/+7
| |
| * util-src/*.c: Don't create globals when loadedKim Alvefur2014-09-166-11/+11
| |
* | plugins/muc/muc.lib: Allow plugins to reject broadcasts in the ↵daurnimator2014-09-161-1/+4
| | | | | | | | muc-broadcast-message event.
* | plugins/mod_muc_unique: Fix undefined global access (thanks Lance)Waqas Hussain2014-09-161-1/+2
| |
* | Merge 0.10->trunkKim Alvefur2014-09-1131-1223/+3545
|\ \ | |/ |/|
| * util.vcard: Turn PHOTO fields into data-urisKim Alvefur2014-09-101-1/+5
| |