aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* util.hex: Normalize hex to lowercase and discard non-hex inputKim Alvefur2015-08-261-1/+2
* Merge 0.9->0.10Kim Alvefur2015-08-261-1/+16
|\
| * ejabberd2prosody: Support password stored as SCRAM hashesKim Alvefur2015-08-201-1/+16
* | 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
* | mod_websocket: Import sessionmanager (fixes traceback)Kim Alvefur2015-08-211-1/+1
* | luacheckrc: Ignore unused _ENV variableKim Alvefur2015-08-201-1/+1
* | util-src/*.c: Invert Lua 5.2 compat to be 5.2+ by default and a macro to supp...Kim Alvefur2015-04-266-21/+21
* | portmanager: Add forward declarationsKim Alvefur2015-04-081-2/+6
* | rostermanager: Add forward declarationsKim Alvefur2015-04-081-3/+9
* | util.sasl.scram: Get rid of module callKim Alvefur2015-04-071-4/+7
* | util.json: Remove use of newproxyKim Alvefur2015-03-131-5/+2
* | prosodyctl: Import LuaSocket to a local, don't assume that a global will be setKim Alvefur2015-03-131-1/+1
* | util.helpers: Fix order of functions using each other [fixes 00412b36166f]Kim Alvefur2015-03-031-8/+8
* | net.server_{select,event}: Don't rely on LuaSocket and LuaSec being present i...Kim Alvefur2015-02-232-11/+11
* | mod_admin_telnet: Remove now broken importing of modulemanager from various c...Kim Alvefur2015-02-221-15/+8
* | net.*: Remove use of module() functionKim Alvefur2015-02-215-34/+44
* | core.*: Remove use of module() functionKim Alvefur2015-02-2113-104/+188
* | util.dependencies: Only abort on Lua versions before 5.1, log a warning about...Kim Alvefur2015-02-211-2/+5
* | util.*: Remove use of module() function, make all module functions local and ...Kim Alvefur2015-02-2135-302/+435
* | 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
* | util.interpolation: Add support for filter functionsKim Alvefur2015-08-071-1/+9
* | util.{interpolation,prosodyctl,sql}: Trim trailing whitespaceKim Alvefur2015-07-173-21/+21
* | util.sql: Add safety check to ensure our chosen connection charset is actuall...Matthew Wild2015-07-081-0/+12
* | util.sql: Fix log level of debug messageMatthew Wild2015-07-081-1/+1
* | util.sql: Log debug message when connecting to databaseMatthew Wild2015-07-081-0/+1
* | util.sql: Make set_encoding() return failure of SET NAMESMatthew Wild2015-07-081-1/+7
* | util.sql: Return failure if set_encoding() failsMatthew Wild2015-07-081-1/+4
* | mod_storage_sql2: Upgrade table if its charset does not match our connection'...Matthew Wild2015-07-081-6/+8
* | util.sql: Use appropriate collation for the chosen character set - fixes MySQ...Matthew Wild2015-07-081-1/+1
* | util.sql: Create table with same charset as the charset we selected for our c...Matthew Wild2015-07-081-1/+1
* | util.sql: Allow onconnect callback to fail connection to the DB by returning ...Matthew Wild2015-07-071-1/+4
* | 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 upg...Matthew Wild2015-07-071-0/+1
* | mod_storage_sql2: Rename variable to avoid name clashMatthew Wild2015-07-071-2/+2
* | net.dns: Remove resolver:new(), as it needlessly and incorrectly duplicates d...Matthew Wild2015-07-061-11/+0
* | Merge with 0.10Matthew Wild2015-07-065-12/+8
|\ \
| * | prosodyctl: check: Add some more known global config optionsKim Alvefur2015-07-051-1/+2
| * | util.sql: Call onconnect, provide noop dummy if not setKim Alvefur2015-07-021-0/+4
| * | Remove sql.lib.lua, not used anymoreKim Alvefur2015-06-271-9/+0
| * | mod_storage_sql2: Validate configuration after normalizing SQLite3 database p...Kim Alvefur2015-06-271-1/+1
| * | 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 ro...Kim Alvefur2015-06-161-5/+0
* | | luacheckrc: Allow plugins to implement functions under module.* (module.load,...Matthew Wild2015-06-291-0/+4
|/ /