aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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.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.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
| |
* | net.websocket: Make data masking configurableFlorian Zeitz2014-09-262-3/+3
| |
* | 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_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_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
* | core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)Kim Alvefur2014-09-232-2/+4
| |