aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-10-267-26/+26
|\
| * Merge 0.9->0.10Kim Alvefur2014-10-263-15/+4
| |\
| | * Tagging 0.9.7Matthew Wild2014-10-240-0/+0
| | |
| | * Backout changeset 6e67c73f730c: not a major fix and it breaks interop with ↵0.9.7Matthew Wild2014-10-241-13/+2
| | | | | | | | | | | | at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either.
| | * prosodyctl: Fix nil global access traceback in `prosodyctl about` (luarocks ↵Waqas Hussain2014-10-191-1/+1
| | | | | | | | | | | | 2.2.0 no longer uses module())
| | * Tagging 0.9.6Matthew Wild2014-10-150-0/+0
| | |
| | * certmanager, net.http: Disable SSLv3 by default0.9.6Matthew Wild2014-10-142-2/+2
| | |
| * | mod_blocklist: Don't send unavailable presence from unavailable sessions ↵Kim Alvefur2014-10-261-1/+3
| | | | | | | | | | | | when blocking a contact
| * | mod_blocklist: Only log message about migrating from mod_privacy when there ↵Kim Alvefur2014-10-251-1/+1
| | | | | | | | | | | | is data to migrate
| * | mod_saslauth: Better name for config optionKim Alvefur2014-10-211-1/+1
| | |
| * | mod_saslauth: Make it possible to disable certain mechanismsKim Alvefur2014-10-211-1/+5
| | |
| * | mod_saslauth: Add LOGIN to mechanisms not allowed over unencrypted ↵Kim Alvefur2014-10-211-1/+1
| | | | | | | | | | | | connections as it may be offered by 3rd party authentication plugins
| * | mod_saslauth: Use a configurable set of mechanisms to not allow over ↵Kim Alvefur2014-10-211-2/+3
| | | | | | | | | | | | unencrypted connections
| * | mod_saslauth: Log warning if no SASL mechanisms were offeredKim Alvefur2014-10-211-1/+5
| | |
| * | mod_saslauth: Use type-specific config option gettersKim Alvefur2014-10-211-2/+2
| | |
| * | mod_legacyauth, mod_saslauth, mod_tls: Pass require_encryption as default ↵Kim Alvefur2014-10-213-4/+4
| | | | | | | | | | | | option to s2s_require_encryption so the later overrides the former
| * | prosodyctl: Add 'require_encryption' to list of deprecated options pointed ↵Kim Alvefur2014-10-211-1/+1
| | | | | | | | | | | | out by the check command
* | | net/server: Handle lack of util.signal correctlydaurnimator2014-10-221-4/+10
| | |
* | | net/server: Remove printdaurnimator2014-10-221-1/+0
| | |
* | | net.server: Rename 'server' config option to 'network_backend' (to select ↵Matthew Wild2014-10-221-1/+1
| | | | | | | | | | | | which net.server implementation to use)
* | | net/server: If server.hook_signal exists, overwrite signal.signal; else make ↵daurnimator2014-10-211-16/+18
| | | | | | | | | | | | | | | | | | | | | server.hook_signal == signal.signal No longer server_event specific server.hook_signal will always exist
* | | Move timer code out of util.timer and into relevant net.server backendsdaurnimator2014-10-203-66/+65
| | |
* | | 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
| | |