Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2015-09-25 | 1 | -0/+5 |
|\ | |||||
| * | mod_s2s: Account for connections that time out in connection count measure | Kim Alvefur | 2015-09-25 | 1 | -0/+5 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-09-24 | 2 | -3/+13 |
|\| | |||||
| * | mod_c2s, mod_s2s: Close incoming connections if there are no features to ↵ | Kim Alvefur | 2015-09-24 | 2 | -3/+13 |
| | | | | | | | | offer on incomplete streams (fixes #285) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-09-22 | 5 | -37/+72 |
|\| | |||||
| * | plugins: Explicitly return to halt event propagation (session.send sometimes ↵ | Kim Alvefur | 2015-09-21 | 5 | -37/+74 |
| | | | | | | | | does not return true) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-09-19 | 1 | -5/+5 |
|\| | |||||
| * | mod_admin_telnet: Fix indentation | Kim Alvefur | 2015-09-18 | 1 | -5/+5 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-09-17 | 3 | -18/+26 |
|\| | |||||
| * | mod_offline: Decrease priority of event handlers so 3rd party hooks fire ↵ | Kim Alvefur | 2015-09-16 | 1 | -2/+2 |
| | | | | | | | | first by default | ||||
| * | mod_blocklist: Explicitly halt event propagation after returning a reply ↵ | Kim Alvefur | 2015-09-16 | 1 | -6/+12 |
| | | | | | | | | (send returns nil sometimes) | ||||
| * | mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain ↵ | Kim Alvefur | 2015-09-15 | 1 | -10/+12 |
| | | | | | | | | (fixes #511) | ||||
| * | MUC: Break a very long line | Kim Alvefur | 2015-09-12 | 1 | -2/+4 |
| | | |||||
* | | MUC: Prevent double replies when MUC affiliation/role change requests fail. | Lance Stout | 2015-09-17 | 1 | -2/+5 |
| | | |||||
* | | MUC: Fix traceback in request for MUC affiliation lists by non-affiliated ↵ | Kim Alvefur | 2015-09-15 | 1 | -1/+1 |
| | | | | | | | | (thanks Lance) | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2015-09-02 | 1 | -6/+4 |
|\| | |||||
| * | mod_carbons: Get full_ and bare_sessions from the prosody global [luacheck] | Kim Alvefur | 2015-08-27 | 1 | -1/+1 |
| | | |||||
| * | mod_carbons: Carbon chat messages or normal messages that have a body | Kim Alvefur | 2015-08-26 | 1 | -5/+3 |
| | | |||||
* | | plugins/muc/muc.lib: Fix issue #505 where unavailable presences were never used | daurnimator | 2015-08-24 | 1 | -4/+4 |
| | | |||||
* | | MUC: Remove duplicated import of muc/persistent (4caef6d53304 and this fixes ↵ | Kim Alvefur | 2015-08-26 | 1 | -1/+0 |
| | | | | | | | | #482) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-08-26 | 1 | -0/+2 |
|\| | |||||
| * | mod_admin_adhoc: Declare local variable, don't set a global [luacheck] | Kim Alvefur | 2015-08-26 | 1 | -0/+1 |
| | | |||||
| * | mod_admin_adhoc: Import missing util.set (fixes #518) | Kim Alvefur | 2015-08-26 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-08-22 | 1 | -1/+1 |
|\| | |||||
| * | mod_websocket: Import sessionmanager (fixes traceback) | Kim Alvefur | 2015-08-21 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-08-20 | 2 | -16/+9 |
|\| | |||||
| * | mod_admin_telnet: Remove now broken importing of modulemanager from various ↵ | Kim Alvefur | 2015-02-22 | 1 | -15/+8 |
| | | | | | | | | commands, use upvalue defined at top of file (thanks daurnimator) | ||||
| * | core.*: Remove use of module() function | Kim Alvefur | 2015-02-21 | 1 | -1/+1 |
| | | |||||
* | | MUC: Fix logic error | Kim Alvefur | 2015-08-17 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2015-08-11 | 1 | -15/+16 |
|\| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2015-08-10 | 1 | -15/+16 |
| |\ | |||||
| | * | mod_component: Fire an event on successful component authentication (For Goffi) | Kim Alvefur | 2015-08-10 | 1 | -0/+1 |
| | | | |||||
* | | | Merge | Matthew Wild | 2015-07-27 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | mod_muc: Fix a traceback when an owner joins a room | Emmanuel Gil Peyrot | 2015-07-25 | 1 | -2/+2 |
| | | | | |||||
* | | | | plugins/muc: Move loading of optional muc libraries from muc.lib.lua to mod_muc | daurnimator | 2015-07-27 | 2 | -48/+49 |
|/ / / | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2015-07-09 | 1 | -10/+46 |
|\| | | |||||
| * | | mod_storage_sql2: Upgrade table if its charset does not match our ↵ | Matthew Wild | 2015-07-08 | 1 | -6/+8 |
| | | | | | | | | | | | | connection's charset (thanks Zash) | ||||
| * | | mod_storage_sql2: Don't upgrade tables without admin intervention | Matthew Wild | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
| * | | mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-line | Matthew Wild | 2015-07-07 | 1 | -0/+33 |
| | | | |||||
| * | | mod_storage_sql2: Add missing return to upgrade_table(), so we know if an ↵ | Matthew Wild | 2015-07-07 | 1 | -0/+1 |
| | | | | | | | | | | | | upgrade is required | ||||
| * | | mod_storage_sql2: Rename variable to avoid name clash | Matthew Wild | 2015-07-07 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-07-05 | 2 | -10/+1 |
|\| | | |||||
| * | | Remove sql.lib.lua, not used anymore | Kim Alvefur | 2015-06-27 | 1 | -9/+0 |
| | | | |||||
| * | | mod_storage_sql2: Validate configuration after normalizing SQLite3 database ↵ | Kim Alvefur | 2015-06-27 | 1 | -1/+1 |
| | | | | | | | | | | | | path (fixes traceback with default config) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2015-06-25 | 2 | -106/+132 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2015-06-25 | 1 | -1/+1 |
| |\| | |||||
| | * | MUC: Prevent admins from being given affiliatons other than owner | Kim Alvefur | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
| | * | Backed out changeset bea3862b6bde in favor of a different approach | Kim Alvefur | 2015-06-25 | 1 | -0/+5 |
| | | | |||||
| | * | MUC: Remove half of monkeypatch that was supposed to make admins always be ↵ | Kim Alvefur | 2015-06-16 | 1 | -5/+0 |
| | | | | | | | | | | | | room owners, fixes #458 | ||||
| * | | Merge with 0.10 | Matthew Wild | 2015-06-24 | 1 | -5/+8 |
| |\ \ |