aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-12-121-16/+46
|\
| * util.datamanager: Add append to public apiKim Alvefur2015-12-111-0/+1
| * util.datamanager: Return extra location infoKim Alvefur2015-12-111-3/+3
| * util.datamanager: Make sure only strings are passed as data to append()Kim Alvefur2015-12-111-0/+1
| * util.datamanager: Add some comments about the append functionKim Alvefur2015-12-111-0/+3
| * util.datamanager: Handle potential error from :write() callKim Alvefur2015-12-111-3/+3
| * util.datamanager: Handle potential issues from fallocateKim Alvefur2015-12-111-1/+10
| * util.datamanager: No shadowing of variable [luacheck]Kim Alvefur2015-12-111-1/+3
| * util.datamanager: Skip past second check if first attemtp to open file succeedsKim Alvefur2015-12-111-3/+3
| * util.datamanager: In append() collect status when closing file handle as it m...Kim Alvefur2015-12-111-3/+9
| * util.datamanager: Overwrite 'data' variable instead of shadownig it [luacheck]Kim Alvefur2015-12-111-1/+1
| * util.datamanager: Factor out code for appending bytes to a fileKim Alvefur2015-12-111-10/+18
* | MUC: Update all config form handlers to take advantage of the new per-option ...Matthew Wild2015-12-1111-34/+25
* | MUC: Fire per-field events for the config form, including those with value ==...Matthew Wild2015-12-111-3/+8
* | mod_bosh: Instead of a global once-per-second timer add a timer for each sess...Kim Alvefur2015-12-071-47/+32
* | Merge 0.10->trunkMatthew Wild2015-12-107-15/+47
|\|
| * mod_admin_telnet: Add http:list() command to get info about current HTTP endp...Matthew Wild2015-12-101-0/+29
| * .luacheckrc: Whitelist import() global functionMatthew Wild2015-12-101-1/+1
| * prosody: Don't silently ignore unknown command-line optionsMatthew Wild2015-12-101-0/+6
| * mod_compression: Remove FIXMEs, mod_c2s and mod_s2s checks if TLS compression...Kim Alvefur2015-12-101-2/+0
| * MUC: Fix previous commitKim Alvefur2015-12-091-2/+2
| * MUC: Process only options that are included in a form (Fixes #521)Kim Alvefur2015-12-081-3/+3
| * util.dataforms: Track which fields are included in a formKim Alvefur2015-12-081-2/+4
| * portmanager: Lower the priority of module-supplied TLS optionsKim Alvefur2015-12-081-1/+1
| * core.usermanager: Return as soon as possible once admin status is knownKim Alvefur2015-12-061-9/+6
* | util.stanza, util.xml, util.xmppstream: Add support for tracking defined name...Matthew Wild2015-12-083-6/+49
* | Merge 0.10->trunkKim Alvefur2015-12-061-25/+64
|\|
| * mod_blocklist: Update Copyright headerKim Alvefur2015-12-061-1/+1
| * mod_blocklist: Skip creating some tables and some processing if unblockingKim Alvefur2015-12-061-8/+9
| * mod_blocklist: When blocking someone who sent a subscription request, forget ...Kim Alvefur2015-12-061-1/+20
| * mod_blocklist: Restructure how we keep track of where to send unavailable pre...Kim Alvefur2015-12-061-3/+13
| * mod_blocklist: session[username] can't possibly be unset if that user is send...Kim Alvefur2015-12-061-10/+9
| * mod_blocklist: Add comments describing some variablesKim Alvefur2015-12-061-2/+2
| * mod_blocklist: Expand comments on caching of blocklistsKim Alvefur2015-12-061-3/+9
| * mod_blocklist: Add comment about compliance issue #575Kim Alvefur2015-12-061-0/+3
| * mod_blocklist: Rename variable for clarityKim Alvefur2015-12-061-5/+5
| * mod_blocklist: Clear second level cache when user is deletedKim Alvefur2015-12-051-0/+1
* | Backout unintentional commit ed5440a6ef7fMatthew Wild2015-12-031-1/+7
* | Merge 0.10->trunkMatthew Wild2015-12-031-0/+1
|\|
| * net.http.server: Import util.cacheMatthew Wild2015-12-031-0/+1
* | Merge 0.10->trunkMatthew Wild2015-12-031-7/+1
* | Merge...Kim Alvefur2015-12-031-2/+25
|\|
| * MergeKim Alvefur2015-12-031-1/+35
| |\
| * | prosodyctl check: Point out that authentication and storage modules should no...Kim Alvefur2015-12-031-0/+14
| * | prosodyctl check: Point out items in the modules_enabled list that incorrectl...Kim Alvefur2015-12-031-0/+9
| * | prosodyctl check: Really store imported LuaSec (must be a leftover from debug...Kim Alvefur2015-12-031-1/+1
| * | prosodyctl check: Include global options when checking "all options"Kim Alvefur2015-12-031-1/+1
* | | mod_storage_sql2: Remove from trunk (all trunk-only changes backported)Matthew Wild2015-12-031-476/+0
* | | Merge 0.10->trunkMatthew Wild2015-12-031-1/+35
|\ \ \ | | |/ | |/|
| * | mod_storage_sql: Add map store (backported from trunk)Matthew Wild2015-12-031-0/+34