Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2016-02-19 | 1 | -3/+4 |
|\ | |||||
| * | rostermanager: Require storagemanager at the top, fixes traceback on Lua 5.2 | Matthew Wild | 2016-02-19 | 1 | -3/+4 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-18 | 3 | -3/+5 |
|\| | |||||
| * | loggingmanager,modulemanager,moduleapi: Ignore warning about accessing ↵ | Kim Alvefur | 2016-02-18 | 3 | -3/+4 |
| | | | | | | | | _G.unpack [luacheck] | ||||
| * | loggingmanager,modulemanager,moduleapi: Localize unpack compatible with Lua 5.2+ | Kim Alvefur | 2016-02-18 | 2 | -2/+4 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-18 | 1 | -1/+1 |
|\| | |||||
| * | certmanager: Localize tonumber | Matthew Wild | 2016-02-18 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-18 | 1 | -1/+1 |
|\| | |||||
| * | loggingmanager: Import select() to fix global access | Matthew Wild | 2016-02-18 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-10 | 2 | -16/+39 |
|\| | |||||
| * | rostermanager: Use map stores when only one contact is changed | Kim Alvefur | 2016-02-09 | 1 | -15/+20 |
| | | |||||
| * | rostermanager: Use storagemanager | Kim Alvefur | 2016-02-09 | 1 | -3/+4 |
| | | |||||
| * | storagemanager: Add set_keys method to map store shim | Kim Alvefur | 2016-02-09 | 1 | -0/+17 |
| | | |||||
| * | storagemanager: Fix map store shim if store is empty | Kim Alvefur | 2014-08-08 | 1 | -1/+1 |
| | | |||||
| * | storagemanager: When map store isn't available, fallback to keyval store ↵ | daurnimator | 2014-08-07 | 1 | -1/+37 |
| | | | | | | | | [backported from trunk] | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-05 | 1 | -4/+3 |
|\| | |||||
| * | certmanager: Try filename.key if certificate is set to a full filename ↵ | Kim Alvefur | 2016-02-05 | 1 | -3/+2 |
| | | | | | | | | ending with .crt | ||||
| * | certmanager: Apply global ssl config later so certificate/key is not ↵ | Kim Alvefur | 2016-02-05 | 1 | -1/+1 |
| | | | | | | | | overwritten by magic | ||||
* | | hostmanager: Remove unused imports of 'jid_split' and 'select' | Matthew Wild | 2016-02-05 | 1 | -3/+1 |
| | | |||||
* | | moduleapi: Silence luacheck warning about unused 'id' parameter | Matthew Wild | 2016-02-05 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-05 | 3 | -95/+97 |
|\| | |||||
| * | certmanager: Support new certificate configuration for non-XMPP services too ↵ | Matthew Wild | 2016-02-05 | 1 | -6/+23 |
| | | | | | | | | (fixes #614) | ||||
| * | loggingmanager: Stringify all arguments to format so we can finally see the ↵ | Kim Alvefur | 2016-02-04 | 1 | -5/+12 |
| | | | | | | | | *real* error messages | ||||
| * | loggingmanager: Remove Windows hack, buffer_mode should fix this | Kim Alvefur | 2016-02-04 | 1 | -7/+0 |
| | | |||||
| * | loggingmanager: Write out timestamps in same write() call as everything else | Kim Alvefur | 2016-02-04 | 1 | -6/+5 |
| | | |||||
| * | loggingmanager: Make initial value for width of log name configurable | Kim Alvefur | 2016-02-04 | 1 | -1/+3 |
| | | |||||
| * | loggingmanager: Move logic for adaptive column width into file sink, append ↵ | Kim Alvefur | 2016-02-04 | 1 | -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 Alvefur | 2016-02-04 | 1 | -74/+45 |
| | | | | | | | | which in turn uses the file sink (tailcalls!) | ||||
| * | loggingmanager: Write out color code, log level and reset code in one call | Kim Alvefur | 2016-02-04 | 1 | -4/+2 |
| | | |||||
| * | loggingmanager: Don't reset default timestamp that is not changed by any ↵ | Kim Alvefur | 2016-02-04 | 1 | -1/+0 |
| | | | | | | | | other code | ||||
| * | moduleapi: Add API method for getting a file path | Kim Alvefur | 2016-02-04 | 1 | -0/+14 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-04 | 1 | -3/+15 |
|\| | |||||
| * | loggingmanager: Call setvbuf on output files, defaulting to line-buffered, ↵ | Matthew Wild | 2016-02-04 | 1 | -3/+15 |
| | | | | | | | | instead of manually calling flush(). Adds 'buffer_mode' option to sink configuration for stdout, console and file sinks. | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-03 | 1 | -0/+28 |
|\| | |||||
| * | core.certmanager: Look for certificate and key in a few different places | Kim Alvefur | 2016-02-03 | 1 | -0/+28 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-02-01 | 1 | -4/+1 |
|\| | |||||
| * | modulemanager, util.pluginloader: Move logic for locating some module ↵ | Matthew Wild | 2016-02-01 | 1 | -4/+1 |
| | | | | | | | | libraries to pluginloader, to fix problems with non-filesystem errors being masked by the second load_code call | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-01-16 | 1 | -1/+1 |
|\| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-01-11 | 1 | -1/+1 |
| |\ | |||||
| | * | core: Increase default read size to "all of it", in practice 8K (size of ↵ | Kim Alvefur | 2016-01-10 | 1 | -1/+1 |
| | | | | | | | | | | | | LuaSockets buffer) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-01-10 | 1 | -4/+4 |
|\| | | |||||
| * | | rostermanager: Rename variable to avoid name clash [luacheck] | Kim Alvefur | 2016-01-09 | 1 | -4/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-12-16 | 1 | -0/+1 |
|\| | | |||||
| * | | loggingmanager: Add prosody.log (intended to be used instead of _G.log now) | Matthew Wild | 2015-12-11 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-12-10 | 2 | -10/+7 |
|\| | | |||||
| * | | portmanager: Lower the priority of module-supplied TLS options | Kim Alvefur | 2015-12-08 | 1 | -1/+1 |
| | | | |||||
| * | | core.usermanager: Return as soon as possible once admin status is known | Kim Alvefur | 2015-12-06 | 1 | -9/+6 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-12-03 | 1 | -2/+22 |
|\| | | |||||
| * | | storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 ↵ | Matthew Wild | 2015-12-03 | 1 | -1/+17 |
| | | | | | | | | | | | | -> mod_storage_sql, mod_storage_sql -> mod_storage_sql1 (temporarily), and emit warning for configs using sql2 | ||||
| * | | storagemanager: Split config retrieval into its own function | Matthew Wild | 2015-12-03 | 1 | -2/+6 |
| | | |