Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2015-04-03 | 3 | -12/+12 |
|\ | |||||
| * | sessionmanager: Rename parameter to avoid varible name conflict | Matthew Wild | 2015-04-03 | 1 | -2/+2 |
| | | |||||
| * | hostmanager: Rename variable to avoid shadowing 'type()' function | Matthew Wild | 2015-04-03 | 1 | -2/+2 |
| | | |||||
| * | loggingmanager: Improve code structure (removes empty if branch) | Matthew Wild | 2015-04-03 | 1 | -9/+9 |
| | | |||||
| * | rostermanager: Remove unused parameter | Matthew Wild | 2015-04-03 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-04-03 | 1 | -15/+25 |
|\| | |||||
| * | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ↵ | Kim Alvefur | 2015-04-03 | 1 | -15/+25 |
| | | | | | | | | metadata field | ||||
| * | Merge 0.9->0.10 (third time lucky) | Matthew Wild | 2015-03-27 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge 0.10->trunk | Matthew Wild | 2015-03-26 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge 0.9->0.10 | Matthew Wild | 2015-03-26 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | sessionmanager: Return 'not-allowed' error instead of the non-existent ↵ | Matthew Wild | 2015-03-24 | 1 | -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->trunk | Matthew Wild | 2015-03-24 | 1 | -0/+1 |
|\| | | |||||
| * | | statsmanager: Fire event at the start of collection to allow for polling | Kim Alvefur | 2015-03-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-02-24 | 1 | -0/+1 |
|\| | | |||||
| * | | statsmanager: Perform an initial collection right after startup is completed | Kim Alvefur | 2015-02-22 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-02-09 | 2 | -21/+44 |
|\| | | |||||
| * | | certmanager: Fix compat for MattJs old LuaSec fork | Kim Alvefur | 2015-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | certmanager: Fix previous commit | Kim Alvefur | 2015-02-05 | 1 | -1/+1 |
| | | | |||||
| * | | certmanager: Limit certificate chain depth to 9 | Kim Alvefur | 2015-02-05 | 1 | -0/+1 |
| | | | |||||
| * | | certmanager: Options that appear to be available since LuaSec 0.2 | Kim Alvefur | 2015-02-05 | 1 | -3/+3 |
| | | | |||||
| * | | certmanager: Improve "detection" of features that depend on LuaSec version | Kim Alvefur | 2015-02-05 | 1 | -11/+15 |
| | | | |||||
| * | | certmanager: Add locals for ssl.context and ssl.x509 | Kim Alvefur | 2015-02-05 | 1 | -3/+5 |
| | | | |||||
| * | | certmanager: Early return from the entire module if LuaSec is unavailable | Kim Alvefur | 2015-02-05 | 1 | -12/+18 |
| | | | |||||
| * | | sessionmanager: Add pre-resource-bind event that would let plugins have a ↵ | Kim Alvefur | 2015-01-30 | 1 | -0/+10 |
| | | | | | | | | | | | | say in resource binding | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-01-26 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-01-26 | 1 | -1/+1 |
| |\| | |||||
| | * | stanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel) | Kim Alvefur | 2015-01-06 | 1 | -1/+1 |
| | | | |||||
| | * | certmanager, net.http: Disable SSLv3 by default | Matthew Wild | 2014-10-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-01-21 | 8 | -7/+78 |
|\| | | |||||
| * | | moduleapi: Module API for statsmanager | Matthew Wild | 2015-01-21 | 1 | -0/+5 |
| | | | |||||
| * | | statsmanager, util.statistics: API changes, remove debugging | Matthew Wild | 2015-01-21 | 1 | -11/+3 |
| | | | |||||
| * | | statsmanager, prosody: New core module and API for gathering statistics ↵ | Matthew Wild | 2015-01-20 | 1 | -0/+75 |
| | | | | | | | | | | | | about the running server | ||||
| * | | storagemanager: Remove unused import of error() | Matthew Wild | 2015-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | sessionmanager: Access bare_session and full_sessions through 'prosody' | Matthew Wild | 2015-01-20 | 1 | -2/+2 |
| | | | |||||
| * | | rostermanager: Access bare_sessions through prosody.bare_sessions | Matthew Wild | 2015-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | portmanager: Remove unused import of pairs() | Matthew Wild | 2015-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | hostmanager: Remove unused import of util.uuid | Matthew Wild | 2015-01-20 | 1 | -1/+0 |
| | | | |||||
| * | | certmanager: Make global variable access explicit | Matthew Wild | 2015-01-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-22 | 1 | -3/+1 |
|\| | | |||||
| * | | certmanager, mod_tls: Return final ssl config as third return value (fix for ↵ | Kim Alvefur | 2014-11-22 | 1 | -3/+1 |
| | | | | | | | | | | | | c6caaa440e74, portmanager assumes non-falsy second return value is an error) (thanks deoren) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-20 | 1 | -1/+3 |
|\| | | |||||
| * | | certmanager: Return final ssl config along with ssl context on success | Kim Alvefur | 2014-11-19 | 1 | -1/+3 |
| | | | |||||
* | | | hostmanager: Don't prevent host_session.send() from routing errors or iq ↵ | Matthew Wild | 2014-09-26 | 1 | -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->trunk | Kim Alvefur | 2014-09-23 | 2 | -2/+4 |
|\| | | |||||
| * | | core.module{manager,api}: Fix for 010b141e91ed (Thanks v1ct0r) | Kim Alvefur | 2014-09-23 | 2 | -2/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-18 | 2 | -4/+8 |
|\| | | |||||
| * | | core.modulemanager, core.moduleapi: Hack around dependency loop | Kim Alvefur | 2014-09-17 | 2 | -3/+6 |
| | | | |||||
| * | | core.moduleapi: Use require instead of global to get storagemanager in ↵ | Kim Alvefur | 2014-09-17 | 1 | -1/+2 |
| | | | | | | | | | | | | module:open_store() | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-09-11 | 2 | -6/+59 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge 0.10->trunk | Matthew Wild | 2014-08-28 | 1 | -1/+1 |
| |\ \ |