aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge trunk->0.10Kim Alvefur2016-03-061-7/+5
|\
| * storagemanager: Fix saving data in map shim when no prior data existsKim Alvefur2016-03-061-7/+5
* | Merge 0.10->trunkKim Alvefur2016-02-221-0/+1
|\|
| * usermanager: Shortcircuit user existence check if they have existing sessionsKim Alvefur2016-02-211-0/+1
* | Merge 0.10->trunkMatthew Wild2016-02-191-3/+4
|\|
| * rostermanager: Require storagemanager at the top, fixes traceback on Lua 5.2Matthew Wild2016-02-191-3/+4
* | Merge 0.10->trunkKim Alvefur2016-02-183-3/+5
|\|
| * loggingmanager,modulemanager,moduleapi: Ignore warning about accessing _G.unp...Kim Alvefur2016-02-183-3/+4
| * 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-102-16/+39
|\|
| * rostermanager: Use map stores when only one contact is changedKim Alvefur2016-02-091-15/+20
| * rostermanager: Use storagemanagerKim Alvefur2016-02-091-3/+4
| * 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 [bac...daurnimator2014-08-071-1/+37
* | Merge 0.10->trunkKim Alvefur2016-02-051-4/+3
|\|
| * certmanager: Try filename.key if certificate is set to a full filename ending...Kim Alvefur2016-02-051-3/+2
| * certmanager: Apply global ssl config later so certificate/key is not overwrit...Kim Alvefur2016-02-051-1/+1
* | 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-053-95/+97
|\|
| * certmanager: Support new certificate configuration for non-XMPP services too ...Matthew Wild2016-02-051-6/+23
| * loggingmanager: Stringify all arguments to format so we can finally see the *...Kim Alvefur2016-02-041-5/+12
| * 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 t...Kim Alvefur2016-02-041-9/+11
| * loggingmanager: Refactor the console log sink to re-use the stdout sink which...Kim Alvefur2016-02-041-74/+45
| * 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 othe...Kim Alvefur2016-02-041-1/+0
| * 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, in...Matthew Wild2016-02-041-3/+15
* | 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
* | Merge 0.10->trunkMatthew Wild2016-02-011-4/+1
|\|
| * modulemanager, util.pluginloader: Move logic for locating some module librari...Matthew Wild2016-02-011-4/+1
* | Merge 0.10->trunkKim Alvefur2016-01-161-1/+1
|\|
| * Merge 0.9->0.10Kim Alvefur2016-01-111-1/+1
| |\
| | * core: Increase default read size to "all of it", in practice 8K (size of LuaS...Kim Alvefur2016-01-101-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-01-101-4/+4
|\| |
| * | rostermanager: Rename variable to avoid name clash [luacheck]Kim Alvefur2016-01-091-4/+4
* | | Merge 0.10->trunkMatthew Wild2015-12-161-0/+1
|\| |
| * | loggingmanager: Add prosody.log (intended to be used instead of _G.log now)Matthew Wild2015-12-111-0/+1
* | | Merge 0.10->trunkMatthew Wild2015-12-102-10/+7
|\| |
| * | portmanager: Lower the priority of module-supplied TLS optionsKim Alvefur2015-12-081-1/+1