Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 default0.9.6 | 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 |
| |\ \ | |||||
| * | | | storagemanager: Fix map store shim if store is empty | Kim Alvefur | 2014-08-08 | 1 | -1/+1 |
| | | | | |||||
| * | | | core/storagemanager: When map store isn't available, fallback to keyval store | daurnimator | 2014-08-07 | 1 | -0/+33 |
| | | | | |||||
| * | | | Merge 0.10->trunk | Matthew Wild | 2014-07-31 | 1 | -0/+5 |
| |\ \ \ | |||||
| * \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-07-25 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-07-04 | 3 | -101/+27 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-05-09 | 3 | -38/+12 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-04-21 | 1 | -8/+9 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-04-20 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-04-15 | 1 | -12/+68 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-04-02 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-03-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-02-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-11-10 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2013-11-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | core.moduleapi: Fix some global accesses. | Waqas Hussain | 2013-11-06 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | core/moduleapi: Return timer object from module:add_timer | daurnimator | 2013-11-06 | 1 | -5/+24 |
| | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | core.sessionmanager: Set a fake thread on destroyed sessions, fixes ↵ | Kim Alvefur | 2014-09-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | traceback if stanzas are emitted after a session is destroyed (thanks Sven Blumenstein) | ||||
* | | | | | | | | | | | | | | | | | core.stanza_router, mod_s2s: Move handling of S2S features to mod_s2s from ↵ | Kim Alvefur | 2014-09-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stanza_router | ||||
* | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2014-09-09 | 1 | -21/+24 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | core.stanza_router: Stricter validation of stanzas | Kim Alvefur | 2014-09-09 | 1 | -21/+24 |
| | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-08-28 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | modulemanager: Reduce warning to debug level message about modules already ↵ | Kim Alvefur | 2014-08-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being loaded, it's probably just module:depends() | ||||
* | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-07-31 | 1 | -0/+5 |
|\| | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |