| Commit message (Expand) | Author | Age | Files | Lines |
* | mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a to... | Kim Alvefur | 2015-04-05 | 1 | -0/+3 |
* | Merge 0.10->trunk | Kim Alvefur | 2015-04-05 | 1 | -6/+5 |
|\ |
|
| * | rostermanager: Fix roster upgrade code (thanks mva) | Kim Alvefur | 2015-04-05 | 1 | -6/+5 |
* | | Merge 0.10->trunk | Kim Alvefur | 2015-04-05 | 1 | -0/+1 |
|\| |
|
| * | rostermanager: Add missing import of `type()` | Florian Zeitz | 2015-04-03 | 1 | -0/+1 |
* | | Merge 0.10->trunk | Matthew Wild | 2015-04-03 | 10 | -730/+861 |
|\| |
|
| * | util-src/*.c: Per convention call luaL_error() as argument to return | Florian Zeitz | 2015-04-03 | 3 | -5/+6 |
| * | 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 |
| * | util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break... | Kim Alvefur | 2015-04-03 | 7 | -716/+846 |
* | | Merge 0.10->trunk | Kim Alvefur | 2015-04-03 | 6 | -29/+50 |
|\| |
|
| * | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ... | Kim Alvefur | 2015-04-03 | 3 | -26/+32 |
| * | prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ssl.x509... | Kim Alvefur | 2015-04-02 | 1 | -1/+1 |
| * | prosodyctl: Document magic commit ID | Paul Aurich | 2015-04-01 | 1 | -0/+1 |
| * | util.table, Makefile: New C module that allows pre-allocation of tables to im... | Matthew Wild | 2015-03-31 | 2 | -2/+16 |
* | | Merge 0.10->trunk | Matthew Wild | 2015-03-27 | 32 | -1367/+3867 |
|\ \
| |/
|/| |
|
| * | Merge 0.10->trunk | Kim Alvefur | 2015-03-27 | 1 | -16/+6 |
| |\ |
|
| * \ | Merge 0.10->trunk | Matthew Wild | 2015-03-26 | 8 | -27/+207 |
| |\ \ |
|
| * \ \ | Merge 0.10->trunk | Matthew Wild | 2015-03-24 | 4 | -6/+58 |
| |\ \ \ |
|
| * \ \ \ | Merge 0.10->trunk | Matthew Wild | 2015-02-24 | 5 | -8/+22 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge | Matthew Wild | 2015-02-23 | 1 | -21/+34 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2015-02-09 | 3 | -22/+45 |
| | |\ \ \ \ \ |
|
| * | \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2015-01-31 | 2 | -1/+11 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| * | | | | | | | Merge 0.10->trunk | Kim Alvefur | 2015-01-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2015-01-21 | 13 | -17/+370 |
| |\ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | 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 |
| * | | | | | | | | | 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 than... | daurnimator | 2015-01-15 | 1 | -2/+1 |
| * | | | | | | | | | net.server_select: Fix timers not being fired until another timer fixes (or 1... | daurnimator | 2015-01-15 | 1 | -16/+8 |
| * | | | | | | | | | net.cqueues: Fix incorrect version check | daurnimator | 2015-01-16 | 1 | -1/+1 |
| * | | | | | | | | | net.cqueues: Fixes hardcoded timeout for first iteration | daurnimator | 2015-01-13 | 1 | -11/+16 |
| * | | | | | | | | | net.cqueues: Add workaround for luaevent callback getting collected | daurnimator | 2015-01-06 | 1 | -1/+5 |
| * | | | | | | | | | mod_muc: Add muc-add-history event to allow modules to override default histo... | Matthew Wild | 2015-01-06 | 1 | -1/+8 |
| * | | | | | | | | | Merge 0.10 -> trunk | Waqas Hussain | 2014-12-16 | 7 | -7/+18 |
| |\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-11-22 | 2 | -10/+8 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-11-20 | 4 | -20/+36 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Matthew Wild | 2014-11-20 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | net.cqueues: Add module that allows use of cqueues while still using net.serv... | daurnimator | 2014-11-18 | 1 | -0/+65 |
| * | | | | | | | | | | | | | plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify n... | daurnimator | 2014-11-14 | 1 | -2/+9 |
| * | | | | | | | | | | | | | plugins/muc/muc.lib: Don't expose actor jids to users when anonymous | daurnimator | 2014-11-11 | 1 | -27/+39 |
| * | | | | | | | | | | | | | Merge 0.10->trunk | Kim Alvefur | 2014-11-09 | 5 | -11/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.10->trunk | Kim Alvefur | 2014-10-26 | 7 | -26/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | net/server: Handle lack of util.signal correctly | daurnimator | 2014-10-22 | 1 | -4/+10 |
| * | | | | | | | | | | | | | | | net/server: Remove print | daurnimator | 2014-10-22 | 1 | -1/+0 |
| * | | | | | | | | | | | | | | | net.server: Rename 'server' config option to 'network_backend' (to select whi... | Matthew Wild | 2014-10-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | net/server: If server.hook_signal exists, overwrite signal.signal; else make ... | daurnimator | 2014-10-21 | 1 | -16/+18 |
| * | | | | | | | | | | | | | | | Move timer code out of util.timer and into relevant net.server backends | daurnimator | 2014-10-20 | 3 | -66/+65 |