aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-05-181-1/+1
|\
| * rostermanager: Use correct variable (missed one place while renaming ↵Kim Alvefur2017-05-181-1/+1
| | | | | | | | variable in b98006bfd97a)
* | Merge 0.10->trunkKim Alvefur2017-03-231-1/+1
|\|
| * storagemanager: Use the existing local reference to 'hosts'Kim Alvefur2017-03-221-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2017-03-161-15/+8
|\|
| * core.moduleapi: Factor out code for getting a scalar config optionKim Alvefur2017-03-151-15/+8
| |
* | Merge 0.10->trunkKim Alvefur2017-03-0610-18/+38
|\|
| * core: Allow select core modules to mutate some globals (needs luacheck 1.19)Kim Alvefur2017-03-043-2/+3
| |
| * core: Split some very long lines [luacheck]Kim Alvefur2017-03-048-16/+35
| |
* | Merge 0.10->trunkKim Alvefur2017-01-021-1/+1
|\|
| * stanza_router: Fix typoKim Alvefur2017-01-021-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-12-142-11/+4
|\|
| * core.stanza_router: Remove hack for allowing resource binding IQ before ↵Kim Alvefur2016-12-131-10/+0
| | | | | | | | resource binding
| * core.sessionmanager, mod_saslauth: Introduce intermediate session type for ↵Kim Alvefur2016-12-131-1/+4
| | | | | | | | authenticated but unbound sessions so that resource binding is not treated as a normal stanza
* | Merge 0.10->trunkKim Alvefur2016-12-101-0/+13
|\|
| * Merge 0.9->0.10Kim Alvefur2016-12-091-0/+13
| |\
| | * core.rostermanager: Add method for checking if the user is subscribed to a ↵Kim Alvefur2016-12-091-0/+12
| | | | | | | | | | | | contact
| | * sessionmanager: Make session.send() return true unless there really is an ↵Kim Alvefur2015-09-211-1/+7
| | | | | | | | | | | | error [backported from 0.10]
* | | Merge 0.10->trunkKim Alvefur2016-11-262-2/+13
|\| |
| * | core.certmanager: Translate "no start line" to something friendlier (thanks ↵Kim Alvefur2016-11-261-0/+5
| | | | | | | | | | | | santiago)
| * | core.stanza_router: Separate iq type check from child count checkKim Alvefur2016-11-251-2/+5
| | |
| * | core.stanza_router: Require 'id' attribute on iq stanzas (fixes #785)Kim Alvefur2016-11-251-0/+3
| | |
* | | Merge 0.10->trunkMatthew Wild2016-09-122-2/+11
|\| |
| * | core.statsmanager: Use correct variable for config validation [luacheck]Kim Alvefur2016-09-121-1/+1
| | |
| * | core.certmanager: Split cipher list into array with comments explaining each ↵Kim Alvefur2016-09-121-1/+10
| | | | | | | | | | | | part
* | | Merge 0.10->trunkMatthew Wild2016-08-311-1/+6
|\| |
| * | stanza_router: Make 'unhandled stanza' errors more informativeMatthew Wild2016-08-311-1/+6
| | |
* | | Merge 0.10->trunkMatthew Wild2016-08-312-6/+11
|\| |
| * | moduleapi: 'duration' became 'times'Matthew Wild2016-08-311-1/+1
| | |
| * | storagemanager: Fix for previous commitMatthew Wild2016-08-311-1/+1
| | |
| * | storagemanager: Fire event when opening a store, and allow the returned ↵Matthew Wild2016-08-311-0/+5
| | | | | | | | | | | | store/err to be overridden
| * | storagemanager: Simplify function flowMatthew Wild2016-08-311-5/+5
| | |
* | | 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
| | |