Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2017-08-28 | 1 | -2/+6 |
|\ | |||||
| * | core.usermanager, various modules: Disconnect other resources on password ↵ | Kim Alvefur | 2017-07-28 | 1 | -2/+6 |
| | | | | | | | | change (thanks waqas) (fixes #512) | ||||
* | | Merge 0.10 -> trunk | Matthew Wild | 2017-07-28 | 1 | -0/+4 |
|\| | |||||
| * | sessionmanager: Revert session.type if binding fails due to roster load error | Matthew Wild | 2017-07-28 | 1 | -0/+4 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-06-01 | 1 | -0/+1 |
|\| | |||||
| * | certmanager: Update the 'certificates' option after the config has been ↵ | Kim Alvefur | 2017-06-01 | 1 | -0/+1 |
| | | | | | | | | reloaded (fixes #929) | ||||
* | | configmanager: Remove unused local [luacheck] | Kim Alvefur | 2017-05-28 | 1 | -2/+2 |
| | | |||||
* | | configmanager: Remove support for multiple parsers, fixes #852. | Emmanuel Gil Peyrot | 2017-05-27 | 1 | -21/+6 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-05-18 | 1 | -1/+1 |
|\| | |||||
| * | rostermanager: Use correct variable (missed one place while renaming ↵ | Kim Alvefur | 2017-05-18 | 1 | -1/+1 |
| | | | | | | | | variable in b98006bfd97a) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-03-23 | 1 | -1/+1 |
|\| | |||||
| * | storagemanager: Use the existing local reference to 'hosts' | Kim Alvefur | 2017-03-22 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-03-16 | 1 | -15/+8 |
|\| | |||||
| * | core.moduleapi: Factor out code for getting a scalar config option | Kim Alvefur | 2017-03-15 | 1 | -15/+8 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-03-06 | 10 | -18/+38 |
|\| | |||||
| * | core: Allow select core modules to mutate some globals (needs luacheck 1.19) | Kim Alvefur | 2017-03-04 | 3 | -2/+3 |
| | | |||||
| * | core: Split some very long lines [luacheck] | Kim Alvefur | 2017-03-04 | 8 | -16/+35 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-02 | 1 | -1/+1 |
|\| | |||||
| * | stanza_router: Fix typo | Kim Alvefur | 2017-01-02 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-12-14 | 2 | -11/+4 |
|\| | |||||
| * | core.stanza_router: Remove hack for allowing resource binding IQ before ↵ | Kim Alvefur | 2016-12-13 | 1 | -10/+0 |
| | | | | | | | | resource binding | ||||
| * | core.sessionmanager, mod_saslauth: Introduce intermediate session type for ↵ | Kim Alvefur | 2016-12-13 | 1 | -1/+4 |
| | | | | | | | | authenticated but unbound sessions so that resource binding is not treated as a normal stanza | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-12-10 | 1 | -0/+13 |
|\| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-12-09 | 1 | -0/+13 |
| |\ | |||||
| | * | core.rostermanager: Add method for checking if the user is subscribed to a ↵ | Kim Alvefur | 2016-12-09 | 1 | -0/+12 |
| | | | | | | | | | | | | contact | ||||
| | * | sessionmanager: Make session.send() return true unless there really is an ↵ | Kim Alvefur | 2015-09-21 | 1 | -1/+7 |
| | | | | | | | | | | | | error [backported from 0.10] | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-11-26 | 2 | -2/+13 |
|\| | | |||||
| * | | core.certmanager: Translate "no start line" to something friendlier (thanks ↵ | Kim Alvefur | 2016-11-26 | 1 | -0/+5 |
| | | | | | | | | | | | | santiago) | ||||
| * | | core.stanza_router: Separate iq type check from child count check | Kim Alvefur | 2016-11-25 | 1 | -2/+5 |
| | | | |||||
| * | | core.stanza_router: Require 'id' attribute on iq stanzas (fixes #785) | Kim Alvefur | 2016-11-25 | 1 | -0/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-09-12 | 2 | -2/+11 |
|\| | | |||||
| * | | core.statsmanager: Use correct variable for config validation [luacheck] | Kim Alvefur | 2016-09-12 | 1 | -1/+1 |
| | | | |||||
| * | | core.certmanager: Split cipher list into array with comments explaining each ↵ | Kim Alvefur | 2016-09-12 | 1 | -1/+10 |
| | | | | | | | | | | | | part | ||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-08-31 | 1 | -1/+6 |
|\| | | |||||
| * | | stanza_router: Make 'unhandled stanza' errors more informative | Matthew Wild | 2016-08-31 | 1 | -1/+6 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2016-08-31 | 2 | -6/+11 |
|\| | | |||||
| * | | moduleapi: 'duration' became 'times' | Matthew Wild | 2016-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | storagemanager: Fix for previous commit | Matthew Wild | 2016-08-31 | 1 | -1/+1 |
| | | | |||||
| * | | storagemanager: Fire event when opening a store, and allow the returned ↵ | Matthew Wild | 2016-08-31 | 1 | -0/+5 |
| | | | | | | | | | | | | store/err to be overridden | ||||
| * | | storagemanager: Simplify function flow | Matthew Wild | 2016-08-31 | 1 | -5/+5 |
| | | | |||||
* | | | 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 |
| | | |