Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10 -> trunk | Matthew Wild | 2016-07-29 | 1 | -59/+66 |
|\ | |||||
| * | statsmanager: Refactor to simplify logic. Notably renames ↵ | Matthew Wild | 2016-07-29 | 1 | -59/+66 |
| | | | | | | | | 'statistics_provider' to 'statistics', and external libs now just begin with ':' | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-07-29 | 1 | -1/+1 |
|\| | |||||
| * | certmanager: Assume default config path of '.' (fixes prosodyctl check certs ↵ | Kim Alvefur | 2016-07-29 | 1 | -1/+1 |
| | | | | | | | | when not installed) | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-07-27 | 1 | -13/+12 |
|\| | |||||
| * | statsmanager: If provider doesn't offer a get_stats method, still fire the ↵ | Matthew Wild | 2016-07-27 | 1 | -13/+12 |
| | | | | | | | | stats-update event if stats_interval is specified (however stats-updated will not fire) | ||||
* | | Merge 0.10 -> trunk | Matthew Wild | 2016-07-27 | 1 | -27/+66 |
|\| | |||||
| * | statsmanager, util.statsd: Add built-in statsd provider | Matthew Wild | 2016-07-27 | 1 | -0/+1 |
| | | |||||
| * | statsmanager: Add 'stats_provider' option, to allow selecting alternative ↵ | Matthew Wild | 2016-07-27 | 1 | -27/+65 |
| | | | | | | | | API providers to util.statistics | ||||
* | | s2smanager: Include a stub thread on destroyed sessions (thanks Link Mauve) | Kim Alvefur | 2016-06-09 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-05-30 | 1 | -1/+0 |
|\| | |||||
| * | core.stanza_router: Remove compatibility with Jabiru not including id ↵ | Kim Alvefur | 2016-05-30 | 1 | -1/+0 |
| | | | | | | | | attribute (originally added in 9b352c8a32e6) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-05-04 | 1 | -1/+1 |
|\| | |||||
| * | portmanager: Set default read size back to 4K | Kim Alvefur | 2016-05-04 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-04-07 | 1 | -2/+2 |
|\| | |||||
| * | moduleapi: Allow an origin session to be passed to module:send() | Kim Alvefur | 2016-04-06 | 1 | -2/+2 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-04-02 | 1 | -1/+1 |
|\| | |||||
| * | storagemanager: Capitalize log message | Kim Alvefur | 2016-04-01 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-03-26 | 1 | -1/+1 |
|\| | |||||
| * | certmanager: Explicitly tonumber() version number segments before doing ↵ | Matthew Wild | 2016-03-26 | 1 | -1/+1 |
| | | | | | | | | arithmetic and avoid relying on implicit coercion (thanks David Favro) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-03-19 | 1 | -1/+3 |
|\| | |||||
| * | modulemanager: Silence log message about attempts to load already loaded ↵ | Kim Alvefur | 2016-03-19 | 1 | -1/+3 |
| | | | | | | | | modules for shared modules | ||||
| * | mod_c2s: Remove use of util.async | Kim Alvefur | 2016-03-17 | 1 | -1/+0 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-03-14 | 1 | -1/+0 |
|\| | |||||
| * | rostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set ↵ | Kim Alvefur | 2016-03-12 | 1 | -1/+0 |
| | | | | | | | | the 'to' attribute | ||||
* | | Merge trunk->0.10 | Kim Alvefur | 2016-03-06 | 1 | -7/+5 |
|\| | |||||
| * | storagemanager: Fix saving data in map shim when no prior data exists | Kim Alvefur | 2016-03-06 | 1 | -7/+5 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-02-22 | 1 | -0/+1 |
|\| | |||||
| * | usermanager: Shortcircuit user existence check if they have existing sessions | Kim Alvefur | 2016-02-21 | 1 | -0/+1 |
| | | |||||
* | | 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 |
|\| |