aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-09-191-5/+5
|\
| * mod_admin_telnet: Fix indentationKim Alvefur2015-09-181-5/+5
| |
* | Merge 0.10->trunkKim Alvefur2015-09-173-18/+26
|\|
| * mod_offline: Decrease priority of event handlers so 3rd party hooks fire ↵Kim Alvefur2015-09-161-2/+2
| | | | | | | | first by default
| * mod_blocklist: Explicitly halt event propagation after returning a reply ↵Kim Alvefur2015-09-161-6/+12
| | | | | | | | (send returns nil sometimes)
| * mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain ↵Kim Alvefur2015-09-151-10/+12
| | | | | | | | (fixes #511)
| * MUC: Break a very long lineKim Alvefur2015-09-121-2/+4
| |
* | MUC: Prevent double replies when MUC affiliation/role change requests fail.Lance Stout2015-09-171-2/+5
| |
* | MUC: Fix traceback in request for MUC affiliation lists by non-affiliated ↵Kim Alvefur2015-09-151-1/+1
| | | | | | | | (thanks Lance)
* | Merge 0.10->trunkMatthew Wild2015-09-021-6/+4
|\|
| * mod_carbons: Get full_ and bare_sessions from the prosody global [luacheck]Kim Alvefur2015-08-271-1/+1
| |
| * mod_carbons: Carbon chat messages or normal messages that have a bodyKim Alvefur2015-08-261-5/+3
| |
* | plugins/muc/muc.lib: Fix issue #505 where unavailable presences were never useddaurnimator2015-08-241-4/+4
| |
* | MUC: Remove duplicated import of muc/persistent (4caef6d53304 and this fixes ↵Kim Alvefur2015-08-261-1/+0
| | | | | | | | #482)
* | Merge 0.10->trunkKim Alvefur2015-08-261-0/+2
|\|
| * mod_admin_adhoc: Declare local variable, don't set a global [luacheck]Kim Alvefur2015-08-261-0/+1
| |
| * mod_admin_adhoc: Import missing util.set (fixes #518)Kim Alvefur2015-08-261-0/+1
| |
* | Merge 0.10->trunkKim Alvefur2015-08-221-1/+1
|\|
| * mod_websocket: Import sessionmanager (fixes traceback)Kim Alvefur2015-08-211-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2015-08-202-16/+9
|\|
| * mod_admin_telnet: Remove now broken importing of modulemanager from various ↵Kim Alvefur2015-02-221-15/+8
| | | | | | | | commands, use upvalue defined at top of file (thanks daurnimator)
| * core.*: Remove use of module() functionKim Alvefur2015-02-211-1/+1
| |
* | MUC: Fix logic errorKim Alvefur2015-08-171-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2015-08-111-15/+16
|\|
| * Merge 0.9->0.10Kim Alvefur2015-08-101-15/+16
| |\
| | * mod_component: Fire an event on successful component authentication (For Goffi)Kim Alvefur2015-08-101-0/+1
| | |
* | | MergeMatthew Wild2015-07-271-2/+2
|\ \ \
| * | | mod_muc: Fix a traceback when an owner joins a roomEmmanuel Gil Peyrot2015-07-251-2/+2
| | | |
* | | | plugins/muc: Move loading of optional muc libraries from muc.lib.lua to mod_mucdaurnimator2015-07-272-48/+49
|/ / /
* | | Merge 0.10->trunkMatthew Wild2015-07-091-10/+46
|\| |
| * | mod_storage_sql2: Upgrade table if its charset does not match our ↵Matthew Wild2015-07-081-6/+8
| | | | | | | | | | | | connection's charset (thanks Zash)
| * | mod_storage_sql2: Don't upgrade tables without admin interventionMatthew Wild2015-07-071-2/+2
| | |
| * | mod_storage_sql2: Add prosodyctl command to upgrade tables from the command-lineMatthew Wild2015-07-071-0/+33
| | |
| * | mod_storage_sql2: Add missing return to upgrade_table(), so we know if an ↵Matthew Wild2015-07-071-0/+1
| | | | | | | | | | | | upgrade is required
| * | mod_storage_sql2: Rename variable to avoid name clashMatthew Wild2015-07-071-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2015-07-052-10/+1
|\| |
| * | Remove sql.lib.lua, not used anymoreKim Alvefur2015-06-271-9/+0
| | |
| * | mod_storage_sql2: Validate configuration after normalizing SQLite3 database ↵Kim Alvefur2015-06-271-1/+1
| | | | | | | | | | | | path (fixes traceback with default config)
* | | Merge 0.10->trunkKim Alvefur2015-06-252-106/+132
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-06-251-1/+1
| |\|
| | * MUC: Prevent admins from being given affiliatons other than ownerKim Alvefur2015-06-251-1/+1
| | |
| | * Backed out changeset bea3862b6bde in favor of a different approachKim Alvefur2015-06-251-0/+5
| | |
| | * MUC: Remove half of monkeypatch that was supposed to make admins always be ↵Kim Alvefur2015-06-161-5/+0
| | | | | | | | | | | | room owners, fixes #458
| * | Merge with 0.10Matthew Wild2015-06-241-5/+8
| |\ \
| * | | mod_storage_sql2: Break up monolithic code into functions, theoretically no ↵Matthew Wild2015-06-241-100/+115
| | | | | | | | | | | | | | | | functionality changes.
| * | | mod_storage_sql2: Improve logging when database read failsMatthew Wild2015-06-241-2/+5
| | | |
| * | | mod_storage_sql2: Some reformatting and variable name improvementsMatthew Wild2015-06-241-4/+4
| | | |
| * | | mod_storage_sql2: Add some commentsMatthew Wild2015-06-241-0/+8
| | | |
* | | | Merge 0.10->trunkKim Alvefur2015-05-211-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | mod_storage_sql2: Fix argument compat thing from 41725f3df3cc, it was backwardsKim Alvefur2015-05-211-1/+1
| | | |