aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge 0.10 -> trunkMatthew Wild2016-07-291-59/+66
|\| |
| * | statsmanager: Refactor to simplify logic. Notably renames ↵Matthew Wild2016-07-291-59/+66
| | | | | | | | | | | | 'statistics_provider' to 'statistics', and external libs now just begin with ':'
* | | Merge 0.10->trunkKim Alvefur2016-07-291-1/+1
|\| |
| * | certmanager: Assume default config path of '.' (fixes prosodyctl check certs ↵Kim Alvefur2016-07-291-1/+1
| | | | | | | | | | | | when not installed)
* | | Merge 0.10->trunkMatthew Wild2016-07-271-13/+12
|\| |
| * | statsmanager: If provider doesn't offer a get_stats method, still fire the ↵Matthew Wild2016-07-271-13/+12
| | | | | | | | | | | | stats-update event if stats_interval is specified (however stats-updated will not fire)
* | | Merge 0.10 -> trunkMatthew Wild2016-07-271-27/+66
|\| |
| * | statsmanager, util.statsd: Add built-in statsd providerMatthew Wild2016-07-271-0/+1
| | |
| * | statsmanager: Add 'stats_provider' option, to allow selecting alternative ↵Matthew Wild2016-07-271-27/+65
| | | | | | | | | | | | API providers to util.statistics
* | | s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve)Kim Alvefur2016-06-091-0/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-05-301-1/+0
|\| |
| * | core.stanza_router: Remove compatibility with Jabiru not including id ↵Kim Alvefur2016-05-301-1/+0
| | | | | | | | | | | | attribute (originally added in 9b352c8a32e6)
* | | Merge 0.10->trunkKim Alvefur2016-05-041-1/+1
|\| |
| * | portmanager: Set default read size back to 4KKim Alvefur2016-05-041-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-04-071-2/+2
|\| |
| * | moduleapi: Allow an origin session to be passed to module:send()Kim Alvefur2016-04-061-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2016-04-021-1/+1
|\| |
| * | storagemanager: Capitalize log messageKim Alvefur2016-04-011-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2016-03-261-1/+1
|\| |
| * | certmanager: Explicitly tonumber() version number segments before doing ↵Matthew Wild2016-03-261-1/+1
| | | | | | | | | | | | arithmetic and avoid relying on implicit coercion (thanks David Favro)
* | | Merge 0.10->trunkKim Alvefur2016-03-191-1/+3
|\| |
| * | modulemanager: Silence log message about attempts to load already loaded ↵Kim Alvefur2016-03-191-1/+3
| | | | | | | | | | | | modules for shared modules
| * | mod_c2s: Remove use of util.asyncKim Alvefur2016-03-171-1/+0
| | |
* | | Merge 0.10->trunkKim Alvefur2016-03-141-1/+0
|\| |
| * | rostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set ↵Kim Alvefur2016-03-121-1/+0
| | | | | | | | | | | | the 'to' attribute
* | | 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 ↵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-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 ↵daurnimator2014-08-071-1/+37
| | | | | | | | | | | | [backported from trunk]
* | | 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
* | | 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 07:45:55 +0000