aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* net/server: Split up different backends in a nicer way. Add global config ↵daurnimator2014-10-171-38/+51
| | | | option 'server'
* plugins/muc/mod_muc: Add 'local_only' flag to mod_muc, so rooms don't get ↵daurnimator2014-10-171-7/+9
| | | | restored on shutdown
* plugins/muc/muc.lib: Add :each_affiliation() iteratordaurnimator2014-10-151-5/+20
|
* plugins/muc/members_only: Kick non-members when members-only is turned ondaurnimator2014-10-151-0/+24
|
* plugins/muc/muc.lib: Kick users from outcast hostsdaurnimator2014-10-151-2/+9
|
* plugins/muc/muc.lib: Fix passing actor along as a boolean (thanks fippo)daurnimator2014-10-151-2/+6
|
* Merge 0.10->trunkMatthew Wild2014-10-143-8/+6
|\
| * Merge 0.9->0.10Matthew Wild2014-10-142-2/+2
| |\
| | * mod_pubsub: Fix error type of 'forbidden' (change from 'cancel' to 'auth')Matthew Wild2014-10-141-1/+1
| | |
| | * mod_s2s: Capitalize log messageKim Alvefur2014-10-101-1/+1
| | |
| * | prosody: Make getfenv() replacement for require() sandboxing local to avoid ↵Kim Alvefur2014-10-131-6/+4
| | | | | | | | | | | | polluting the globals table
* | | Merge 0.10->trunkWaqas Hussain2014-10-082-3/+14
|\| |
| * | Merge 0.9->0.10Waqas Hussain2014-10-082-3/+14
| |\|
| | * util/dataforms: Make sure we iterate over field tagsdaurnimator2014-10-071-1/+1
| | |
| | * util.stanza: Escape newlines and tabs (\r\n\t) when serializing stanzas. ↵Waqas Hussain2014-10-081-2/+13
| | | | | | | | | | | | \r\n transforms into \n otherwise, and \r\n\t in attributes transforms into spaces.
* | | Merge 0.10->trunkKim Alvefur2014-10-054-9/+98
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-10-052-6/+11
| |\|
| | * net.dns: Avoid duplicate cache entriesFlorian Zeitz2014-10-051-4/+9
| | |
| | * mod_admin_adhoc: Add required to field in user deletion form tooKim Alvefur2014-09-291-1/+1
| | |
| | * mod_admin_adhoc: Mark 'accountjids' field as required in 'end user sessions' ↵Kim Alvefur2014-09-291-1/+1
| | | | | | | | | | | | command (thanks Lloyd)
| * | mod_blocklist: Capitalize log messageKim Alvefur2014-10-051-1/+1
| | |
| * | net.server_select: Reset read timeout timer if the event is handledKim Alvefur2014-10-031-0/+2
| | |
| * | mod_admin_web: Add "List S2S connections" commandFlorian Zeitz2014-09-281-0/+82
| | |
| * | mod_admin_adhoc: Show IP in detailed version of online user listingFlorian Zeitz2014-09-281-2/+2
| | |
* | | 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)