aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-04-051-6/+5
|\
| * rostermanager: Fix roster upgrade code (thanks mva)Kim Alvefur2015-04-051-6/+5
| |
* | Merge 0.10->trunkKim Alvefur2015-04-051-0/+1
|\|
| * rostermanager: Add missing import of `type()`Florian Zeitz2015-04-031-0/+1
| |
* | Merge 0.10->trunkMatthew Wild2015-04-033-12/+12
|\|
| * sessionmanager: Rename parameter to avoid varible name conflictMatthew Wild2015-04-031-2/+2
| |
| * hostmanager: Rename variable to avoid shadowing 'type()' functionMatthew Wild2015-04-031-2/+2
| |
| * loggingmanager: Improve code structure (removes empty if branch)Matthew Wild2015-04-031-9/+9
| |
| * rostermanager: Remove unused parameterMatthew Wild2015-04-031-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2015-04-031-15/+25
|\|
| * rostermanager, mod_roster, mod_presence: Move pending roster items to roster ↵Kim Alvefur2015-04-031-15/+25
| | | | | | | | metadata field
| * Merge 0.9->0.10 (third time lucky)Matthew Wild2015-03-271-1/+1
| |\
* | \ Merge 0.10->trunkMatthew Wild2015-03-261-1/+1
|\ \ \
| * \ \ Merge 0.9->0.10Matthew Wild2015-03-261-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * sessionmanager: Return 'not-allowed' error instead of the non-existent ↵Matthew Wild2015-03-241-1/+1
| | | | | | | | | | | | 'already-bound' error when client tries to bind a resource twice on the same stream (thanks Flow) fixes issue #484.
* | | Merge 0.10->trunkMatthew Wild2015-03-241-0/+1
|\| |
| * | statsmanager: Fire event at the start of collection to allow for pollingKim Alvefur2015-03-101-0/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2015-02-241-0/+1
|\| |
| * | statsmanager: Perform an initial collection right after startup is completedKim Alvefur2015-02-221-0/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2015-02-092-21/+44
|\| |
| * | certmanager: Fix compat for MattJs old LuaSec forkKim Alvefur2015-02-051-1/+1
| | |
| * | certmanager: Fix previous commitKim Alvefur2015-02-051-1/+1
| | |
| * | certmanager: Limit certificate chain depth to 9Kim Alvefur2015-02-051-0/+1
| | |
| * | certmanager: Options that appear to be available since LuaSec 0.2Kim Alvefur2015-02-051-3/+3
| | |
| * | certmanager: Improve "detection" of features that depend on LuaSec versionKim Alvefur2015-02-051-11/+15
| | |
| * | certmanager: Add locals for ssl.context and ssl.x509Kim Alvefur2015-02-051-3/+5
| | |
| * | certmanager: Early return from the entire module if LuaSec is unavailableKim Alvefur2015-02-051-12/+18
| | |
| * | sessionmanager: Add pre-resource-bind event that would let plugins have a ↵Kim Alvefur2015-01-301-0/+10
| | | | | | | | | | | | say in resource binding
* | | Merge 0.10->trunkKim Alvefur2015-01-261-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-01-261-1/+1
| |\|
| | * stanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel)Kim Alvefur2015-01-061-1/+1
| | |
| | * certmanager, net.http: Disable SSLv3 by defaultMatthew Wild2014-10-141-1/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2015-01-218-7/+78
|\| |
| * | moduleapi: Module API for statsmanagerMatthew Wild2015-01-211-0/+5
| | |
| * | statsmanager, util.statistics: API changes, remove debuggingMatthew Wild2015-01-211-11/+3
| | |
| * | statsmanager, prosody: New core module and API for gathering statistics ↵Matthew Wild2015-01-201-0/+75
| | | | | | | | | | | | about the running server
| * | storagemanager: Remove unused import of error()Matthew Wild2015-01-201-1/+1
| | |
| * | sessionmanager: Access bare_session and full_sessions through 'prosody'Matthew Wild2015-01-201-2/+2
| | |
| * | rostermanager: Access bare_sessions through prosody.bare_sessionsMatthew Wild2015-01-201-1/+1
| | |
| * | portmanager: Remove unused import of pairs()Matthew Wild2015-01-201-1/+1
| | |
| * | hostmanager: Remove unused import of util.uuidMatthew Wild2015-01-201-1/+0
| | |
| * | certmanager: Make global variable access explicitMatthew Wild2015-01-201-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2014-11-221-3/+1
|\| |
| * | certmanager, mod_tls: Return final ssl config as third return value (fix for ↵Kim Alvefur2014-11-221-3/+1
| | | | | | | | | | | | c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren)
* | | Merge 0.10->trunkKim Alvefur2014-11-201-1/+3
|\| |
| * | certmanager: Return final ssl config along with ssl context on successKim Alvefur2014-11-191-1/+3
| | |
* | | hostmanager: Don't prevent host_session.send() from routing errors or iq ↵Matthew Wild2014-09-261-7/+0
| | | | | | | | | | | | results, so modules can handle them. This code was originally added for a reason, but I can't remember what it was.
* | | Merge 0.10->trunkKim Alvefur2014-09-232-2/+4
|\| |
| * | core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r)Kim Alvefur2014-09-232-2/+4
| | |
* | | Merge 0.10->trunkKim Alvefur2014-09-182-4/+8
|\| |