aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | mod_muc/muc.lib: Remove is_anonymous from event (fix for ec57067c1e0d)Matthew Wild2014-07-251-2/+2
* | | mod_muc/muc.lib: Pass all info to muc-broadcast-presence handlers that would ...Matthew Wild2014-07-251-1/+5
* | | Merge 0.10->trunkMatthew Wild2014-07-252-0/+2
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-07-252-0/+2
| |\|
| | * net.server_select/event: Switch sender mode to *a when reading, to make sure ...Matthew Wild2014-07-252-0/+2
* | | Merge 0.10->trunkMatthew Wild2014-07-252-11/+8
|\| |
| * | Merge 0.9->0.10Matthew Wild2014-07-252-11/+8
| |\|
| | * mod_admin_telnet: Fix dns:(add,set)nameservers()Kim Alvefur2014-07-251-2/+2
| | * net.dns: Remove unused obsolete codeMatthew Wild2014-07-251-4/+1
| | * net.dns: Ensure all pending requests get notified of a timeout when looking u...Matthew Wild2014-07-251-5/+5
* | | util.vcard: Add support for uri types in vcard4Kim Alvefur2014-07-091-0/+2
* | | Merge 0.10->trunkKim Alvefur2014-07-091-1/+1
|\| |
| * | mod_dialback: Respect dwd config optionKim Alvefur2014-07-091-1/+1
* | | mod_pep_plus: Only broadcast newly added subscriptionsKim Alvefur2014-07-081-9/+26
* | | Merge 0.10->trunkKim Alvefur2014-07-0412-133/+170
|\| |
| * | mod_dialback.lua: Only check certificates on secure connectionsKim Alvefur2014-07-041-6/+8
| * | mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use th...Kim Alvefur2014-07-046-12/+13
| * | mod_dialback: Short-circuit dialback auth if certificate is considered validKim Alvefur2014-07-042-1/+11
| * | mod_dialback: Keep the same dialback secret across module reloadsKim Alvefur2014-07-031-1/+9
| * | hostmanager, mod_dialback: Move generation of dialback secret out of coreKim Alvefur2014-05-222-2/+4