aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | core.usermanager: Return as soon as possible once admin status is knownKim Alvefur2015-12-061-9/+6
* | | Merge 0.10->trunkMatthew Wild2015-12-031-2/+22
|\| |
| * | storagemanager, mod_storage_sql, mod_storage_sql2: Rename mod_storage_sql2 ->...Matthew Wild2015-12-031-1/+17
| * | storagemanager: Split config retrieval into its own functionMatthew Wild2015-12-031-2/+6
* | | Merge 0.10->trunkKim Alvefur2015-11-092-3/+5
|\| |
| * | sessionmanager: Demote write error to debug messageKim Alvefur2015-11-051-1/+1
| * | sessionmanager: Clarify log message when failing to write data to connectionKim Alvefur2015-11-041-3/+2
| * | statsmanager: Add get() methodMatthew Wild2015-10-181-0/+3
* | | Merge 0.10->trunkKim Alvefur2015-10-111-0/+2
|\| |
| * | core.certmanager: Remove non-string filenames (allows setting eg capath to fa...Kim Alvefur2015-10-111-0/+2
* | | Merge 0.10->trunkKim Alvefur2015-09-221-1/+7
|\| |
| * | sessionmanager: Make session.send() return true unless there really is an errorKim Alvefur2015-09-211-1/+7
* | | Merge 0.10->trunkMatthew Wild2015-09-021-3/+9
|\| |
| * | storagemanager: Check if drivers support purging, warn otherwiseKim Alvefur2015-09-021-3/+8
| * | storagemanager: Export purge (fixes deleting users from usermanager) (thanks mt)Kim Alvefur2015-09-021-0/+1
* | | storagemanager: Add forward declaration to fix use of open() before it's definedKim Alvefur2015-08-201-1/+4
* | | Merge 0.10->trunkKim Alvefur2015-08-2012-98/+192
|\| |
| * | portmanager: Add forward declarationsKim Alvefur2015-04-081-2/+6
| * | rostermanager: Add forward declarationsKim Alvefur2015-04-081-3/+9
| * | core.*: Remove use of module() functionKim Alvefur2015-02-2112-103/+187
* | | Merge 0.10->trunkMatthew Wild2015-05-193-51/+64
|\| |
| * | loggingmanager: Rename function arguments to avoid name conflict [luacheck] (...Matthew Wild2015-05-181-8/+8
| * | configmanager: Refactor function to avoid re-declaring local variable [luacheck]Matthew Wild2015-05-181-9/+11
| * | configmanager: Rename unused function arguments [luacheck]Matthew Wild2015-05-181-3/+3
| * | configmanager: Rename variable to avoid name conflicts [luacheck]Matthew Wild2015-05-181-10/+10
| * | configmanager: Rename unused function argument [luacheck]Matthew Wild2015-05-181-1/+1
| * | configmanager: Remove unnecessary function localizations [luacheck]Matthew Wild2015-05-181-2/+1
| * | configmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-181-15/+12
| * | configmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-181-3/+3
| * | hostmanager: Metatable with __tostring on hostsKim Alvefur2015-05-181-0/+15
* | | Merge 0.10->trunkKim Alvefur2015-05-141-0/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-05-141-0/+1
| |\|
| | * s2smanager: Make sure destroyed sessions have a sends2s methodKim Alvefur2015-05-141-0/+1
* | | Merge 0.10->trunkKim Alvefur2015-05-131-4/+4
|\| |
| * | portmanager: Remove unused argument from function [luacheck]Matthew Wild2015-05-131-1/+1
| * | portmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-131-2/+2
| * | portmanager: Add luacheck annotationsMatthew Wild2015-05-131-1/+1