aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2014-08-2810-21/+37
|\
| * Merge 0.9->0.10Matthew Wild2014-08-2810-20/+36
| |\
| | * util.filters: Ignore filters being added twice (fixes issues on removal)0.9.5Matthew Wild2014-08-281-0/+2
| | * mod_privacy: Fix to correctly sort privacy list rules by order (thanks Flow)Matthew Wild2014-08-281-1/+1
| | * mod_c2s, mod_s2s: Log received invalid stream headersMatthew Wild2014-08-232-1/+2
| | * util.xmppstream: When error is 'no-stream', pass the received tagname to the ...Matthew Wild2014-08-231-1/+1
| | * mod_s2s: Reset stream ID when resetting stream [compliance]Kim Alvefur2014-08-271-0/+1
| | * modulemanager: Reduce warning to debug level message about modules already be...Kim Alvefur2014-08-271-1/+1
| | * net.http.server: Comment out a log messageKim Alvefur2014-08-271-1/+1
| | * mod_s2s: Mark stream as opened earlier for outgoing connections, fixes double...Kim Alvefur2014-08-261-1/+2
| | * mod_compression: Handle compression setup errors by logging a warning about i...Kim Alvefur2014-08-261-0/+6
| | * mod_posix: Make sure that 'pidfile' is a stringKim Alvefur2014-08-261-1/+1
| | * prosodyctl: Verify that 'pidfile' is a string, show friendly error otherwiseKim Alvefur2014-08-262-0/+5
| * | util.xmppstream: Don't include empty stream ID in stream header (got here fro...Kim Alvefur2014-08-271-1/+1
* | | Merge 0.10->trunkKim Alvefur2014-08-131-6/+6
|\| |
| * | mod_private: Fix traceback due to missing table indexKim Alvefur2014-08-131-1/+1
| * | mod_blocklist: Use full word as variable name, we can afford thatKim Alvefur2014-08-121-4/+4
| * | mod_blocklist: Correct commentKim Alvefur2014-08-121-1/+1
| * | mod_blocklist: Fix any unblock emptying the blocklistKim Alvefur2014-08-121-1/+1
* | | mod_storage_sql2: DELETE then INSERT in map storesKim Alvefur2014-08-121-13/+8
* | | mod_muc: Fix tracebacks (thanks nick1)Kim Alvefur2014-08-111-5/+5
* | | Merge 0.10->trunkKim Alvefur2014-08-103-439/+277
|\| |
| * | mod_privacy: Remove, leave a log message about being replaced by mod_blocklis...Kim Alvefur2014-08-101-438/+3
| * | prosody.cfg.lua.dist: Replace mod_privacy with mod_blocklist in the default c...Kim Alvefur2014-08-101-1/+1
| * | mod_blocklist: XEP-0191 implementation written for speed and independence fro...Kim Alvefur2014-08-101-0/+273
* | | mod_private: Use map storeKim Alvefur2014-08-091-12/+9
* | | Merge 0.10->trunkKim Alvefur2014-08-092-55/+39
|\| |
| * | mod_private: Cleanup and more tailcallsKim Alvefur2014-08-091-30/+26
| * | util.jid: Optimize bareKim Alvefur2014-08-071-5/+1
| * | util.jid: Use existing join function in jid.prepKim Alvefur2014-08-071-15/+8
| * | util.jid: Return early in join on invalid jidsKim Alvefur2014-08-071-6/+5
| * | mod_s2s: Remove unused localsKim Alvefur2014-07-251-2/+0
* | | storagemanager: Fix map store shim if store is emptyKim Alvefur2014-08-081-1/+1
* | | plugins/mod_storage_sql2: Return correct arguments from map_store operationsdaurnimator2014-08-071-2/+6
* | | plugins/muc/mod_muc: persistent rooms keyval store needs username as nildaurnimator2014-08-071-4/+4
* | | plugins/muc/mod_muc: Use map store for room persistencedaurnimator2014-08-071-59/+72
* | | plugins/muc/mod_muc: Remove unused importdaurnimator2014-08-071-1/+0
* | | plugins/mod_storage_sql2: Add map store supportdaurnimator2014-08-071-0/+35
* | | core/storagemanager: When map store isn't available, fallback to keyval storedaurnimator2014-08-071-0/+33
* | | mod_muc: Import util.stanza into the config handler modules that need it. Fix...Matthew Wild2014-08-053-0/+6
* | | mod_muc: Fix use of undefined global. Fixes #431.Matthew Wild2014-08-051-1/+2
* | | Merge 0.10->trunkMatthew Wild2014-07-312-4/+7
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-07-312-4/+7
| |\|
| | * prosodyctl: Remove nonsensical warningMatthew Wild2014-07-311-1/+0
| | * prosodyctl: Improve JID splitting and normalization for adduser/passwd/deluserMatthew Wild2014-07-311-3/+5
| | * configmanager: nameprep VirtualHost and Component namesMatthew Wild2014-07-311-0/+5
* | | Merge 0.10->trunkKim Alvefur2014-07-253-36/+47
|\ \ \
| * | | mod_s2s: Remove unused localsKim Alvefur2014-07-251-2/+0
| |/ /
| * | mod_s2s_auth_certs: Pick a logging function once and stick with itKim Alvefur2014-07-251-4/+5
| * | mod_s2s_auth_certs: Split PKIX based certificate checking from mod_s2s into n...Kim Alvefur2014-07-253-34/+46