Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Matthew Wild | 2015-03-24 | 4 | -6/+58 |
|\ | |||||
| * | prosodyctl: Expand plugin paths and attempt to identify prosody-modules ↵ | Kim Alvefur | 2015-01-21 | 1 | -1/+14 |
| | | | | | | | | checkouts | ||||
| * | prosodyctl: Use util.mercurial to identify hg repository and revision | Kim Alvefur | 2015-01-21 | 1 | -1/+4 |
| | | |||||
| * | util.mercurial: Utility functions for Mercurial repositories | Kim Alvefur | 2015-01-21 | 1 | -0/+34 |
| | | |||||
| * | prosodyctl: Show relative paths in about | Kim Alvefur | 2014-07-04 | 1 | -4/+6 |
| | | |||||
| * | Backed out 35ebcb733c4c | Kim Alvefur | 2015-03-23 | 1 | -1/+0 |
| | | |||||
| * | 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 | 5 | -8/+22 |
|\| | |||||
| * | Merge 0.9->0.10 | Matthew Wild | 2015-02-24 | 1 | -0/+6 |
| |\ | |||||
| | * | configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set ↵ | Matthew Wild | 2015-02-24 | 1 | -0/+6 |
| | | | | | | | | | | | | and --libdir isn't (thanks Medics) | ||||
| | * | mod_admin_telnet: Require util.pposix (fixes #471) | Matthew Wild | 2015-02-20 | 1 | -0/+1 |
| | | | |||||
| * | | statsmanager: Perform an initial collection right after startup is completed | Kim Alvefur | 2015-02-22 | 1 | -0/+1 |
| | | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-02-21 | 4 | -8/+15 |
| |\| | |||||
| | * | util.datamanager: Check that the global 'prosody' exists before using it ↵ | Kim Alvefur | 2015-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | (fixes nil indexing in use outside of prosody) | ||||
| | * | configure, Makefile: Add --libdir option to ./configure, allowing you to ↵ | Matthew Wild | 2015-02-20 | 3 | -7/+14 |
| | | | | | | | | | | | | override the $PREFIX/lib/ default. Fixes #470. | ||||
* | | | Merge | Matthew Wild | 2015-02-23 | 1 | -21/+34 |
|\ \ \ | |||||
| * | | | Merge 0.10->trunk | Kim Alvefur | 2015-02-09 | 3 | -22/+45 |
| |\| | | |||||
| | * | | 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 |
| | | | | |||||
* | | | | Merge 0.10->trunk | Matthew Wild | 2015-01-31 | 2 | -1/+11 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge with 0.10 | Matthew Wild | 2015-01-31 | 1 | -0/+10 |
| |\ \ | |||||
| | * | | sessionmanager: Add pre-resource-bind event that would let plugins have a ↵ | Kim Alvefur | 2015-01-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | say in resource binding | ||||
| * | | | util.statistics: Return 0 as percentile if data out of range | Matthew Wild | 2015-01-30 | 1 | -1/+1 |
| |/ / | |||||
* | | | 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 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-01-21 | 13 | -17/+370 |
|\| | | |||||
| * | | 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 | 2 | -35/+56 |
| | | | |||||
| * | | statsmanager, prosody: New core module and API for gathering statistics ↵ | Matthew Wild | 2015-01-20 | 2 | -0/+76 |
| | | | | | | | | | | | | about the running server | ||||
| * | | util.statistics: New library for gathering various kinds of statistics | Matthew Wild | 2015-01-20 | 1 | -0/+131 |
| | | | |||||
| * | | 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 |
| | | | |||||
| * | | mod_carbons: Import XEP-0280 implementation from prosody-modules (sans ↵ | Kim Alvefur | 2015-01-16 | 1 | -0/+111 |
| | | | | | | | | | | | | compat with older versions of the protocol) | ||||
| * | | util.hex: Pedantic optimization, 1 table lookup per byte instead of 3 ↵ | Kim Alvefur | 2015-01-12 | 1 | -7/+13 |
| | | | | | | | | | | | | function calls makes it go faster | ||||
| * | | mod_pep: Fire an event when an item is published | Kim Alvefur | 2014-12-20 | 1 | -3/+7 |
| | | | |||||
* | | | net.server_select: Remove unused code | daurnimator | 2015-01-19 | 1 | -6/+0 |
| | | | |||||
* | | | net.server_select: Remove socket.sleep call from main loop | daurnimator | 2015-01-19 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | | | It's been there since the start; but should really not be required. People can remember an issue with FreeBSD that this solved, but this was a hack solution anyway. If that issue rears it's head again, we will solve it properly. | ||||
* | | | net.server_select: Remove do-nothing os_difftime calls | daurnimator | 2015-01-19 | 1 | -5/+3 |
| | | | |||||
* | | | net.server_select: In add_task timer callback, use passed in time rather ↵ | daurnimator | 2015-01-15 | 1 | -2/+1 |
| | | | | | | | | | | | | than re-fetching | ||||
* | | | net.server_select: Fix timers not being fired until another timer fixes (or ↵ | daurnimator | 2015-01-15 | 1 | -16/+8 |
| | | | | | | | | | | | | 1 second passes) |