aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-02-181-1/+1
|\
| * Makefile: Use runtime set by configure (fixes #629)Kim Alvefur2016-02-181-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-02-183-3/+5
|\|
| * loggingmanager,modulemanager,moduleapi: Ignore warning about accessing ↵Kim Alvefur2016-02-183-3/+4
| | | | | | | | _G.unpack [luacheck]
| * loggingmanager,modulemanager,moduleapi: Localize unpack compatible with Lua 5.2+Kim Alvefur2016-02-182-2/+4
| |
* | Merge 0.10->trunkMatthew Wild2016-02-181-1/+1
|\|
| * certmanager: Localize tonumberMatthew Wild2016-02-181-1/+1
| |
* | Merge 0.10->trunkMatthew Wild2016-02-181-1/+1
|\|
| * loggingmanager: Import select() to fix global accessMatthew Wild2016-02-181-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-02-103-25/+69
|\|
| * mod_storage_sql: Silence some harmless luacheck warningsKim Alvefur2016-02-091-0/+3
| |
| * rostermanager: Use map stores when only one contact is changedKim Alvefur2016-02-091-15/+20
| |
| * rostermanager: Use storagemanagerKim Alvefur2016-02-091-3/+4
| |
| * mod_storage_sql: Implement map:set_keys, allowing multiple keys to be set in ↵Kim Alvefur2016-02-091-17/+23
| | | | | | | | the same transaction
| * storagemanager: Add set_keys method to map store shimKim Alvefur2016-02-091-0/+17
| |
| * storagemanager: Fix map store shim if store is emptyKim Alvefur2014-08-081-1/+1
| |
| * storagemanager: When map store isn't available, fallback to keyval store ↵daurnimator2014-08-071-1/+37
| | | | | | | | [backported from trunk]
| * mod_storage_sql: Support non-string keys in map storeKim Alvefur2016-02-081-2/+14
| |
* | MergeMatthew Wild2016-02-081-4/+3
|\ \
| * | Merge 0.10->trunkKim Alvefur2016-02-051-4/+3
| |\|
| | * certmanager: Try filename.key if certificate is set to a full filename ↵Kim Alvefur2016-02-051-3/+2
| | | | | | | | | | | | ending with .crt
| | * certmanager: Apply global ssl config later so certificate/key is not ↵Kim Alvefur2016-02-051-1/+1
| | | | | | | | | | | | overwritten by magic
* | | prosodyctl: fix CnP bug in deluser outputThomas Gstädtner2016-02-081-2/+2
|/ /
* | hostmanager: Remove unused imports of 'jid_split' and 'select'Matthew Wild2016-02-051-3/+1
| |
* | moduleapi: Silence luacheck warning about unused 'id' parameterMatthew Wild2016-02-051-1/+1
| |
* | Merge 0.10->trunkMatthew Wild2016-02-055-102/+100
|\|
| * certmanager: Support new certificate configuration for non-XMPP services too ↵Matthew Wild2016-02-051-6/+23
| | | | | | | | (fixes #614)
| * loggingmanager: Stringify all arguments to format so we can finally see the ↵Kim Alvefur2016-02-041-5/+12
| | | | | | | | *real* error messages
| * loggingmanager: Remove Windows hack, buffer_mode should fix thisKim Alvefur2016-02-041-7/+0
| |
| * loggingmanager: Write out timestamps in same write() call as everything elseKim Alvefur2016-02-041-6/+5
| |
| * loggingmanager: Make initial value for width of log name configurableKim Alvefur2016-02-041-1/+3
| |
| * loggingmanager: Move logic for adaptive column width into file sink, append ↵Kim Alvefur2016-02-041-9/+11
| | | | | | | | tab if disabled (fixes separation between name and level in plain file sinks)
| * loggingmanager: Refactor the console log sink to re-use the stdout sink ↵Kim Alvefur2016-02-041-74/+45
| | | | | | | | which in turn uses the file sink (tailcalls!)
| * loggingmanager: Write out color code, log level and reset code in one callKim Alvefur2016-02-041-4/+2
| |
| * loggingmanager: Don't reset default timestamp that is not changed by any ↵Kim Alvefur2016-02-041-1/+0
| | | | | | | | other code
| * util.logger: Silence luacheck warningKim Alvefur2016-02-041-0/+1
| |
| * util.logger: Remove unused localsKim Alvefur2016-02-041-4/+1
| |
| * mod_groups: Move variable to smaller scopeKim Alvefur2016-02-041-3/+1
| |
| * mod_groups: Use module:get_option_path, look for file relative to config dirKim Alvefur2016-02-041-1/+1
| |
| * moduleapi: Add API method for getting a file pathKim Alvefur2016-02-041-0/+14
| |
* | Merge 0.10->trunkMatthew Wild2016-02-041-3/+15
|\|
| * loggingmanager: Call setvbuf on output files, defaulting to line-buffered, ↵Matthew Wild2016-02-041-3/+15
| | | | | | | | instead of manually calling flush(). Adds 'buffer_mode' option to sink configuration for stdout, console and file sinks.
* | MUC: Roll back parts of 50b9a7e86de9 that were not in the disco#info eventKim Alvefur2016-02-042-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-02-031-0/+28
|\|
| * core.certmanager: Look for certificate and key in a few different placesKim Alvefur2016-02-031-0/+28
| |
* | MUC: Fix copypaste mistakeKim Alvefur2016-02-031-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-02-032-2/+234
|\|
| * MUC: Fire a muc-disco#info event like in trunk so modules can extend the replyKim Alvefur2016-02-031-6/+13
| |
| * Add util.ringbuffer, a ringbuffer with a file handle like interfaceKim Alvefur2016-02-022-2/+234
| |
* | MUC: Separate form data from form in disco#info eventKim Alvefur2016-02-033-6/+7
| |