aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2015-09-030-0/+0
|\
| * net.server_{select,event}: addclient: Use getaddrinfo to detect IP address ty...Kim Alvefur2013-12-232-2/+17
| * net.server_{select,event}: addclient: Add argument for overriding socket typeKim Alvefur2013-12-232-4/+18
| * net/server_event: pcall require ssl rather than relying on globalsdaurnimator2013-12-181-15/+7
| * net/server_event: add_client should have same arguments no-matter the server ...daurnimator2013-12-181-21/+6
| * net/server_select: Fix typodaurnimator2013-12-181-1/+1
| * net/server_select: addclient: Check argumentsdaurnimator2013-12-181-0/+15
| * net/server_select: addclient: Check for failure correctly; remove wrapconnect...daurnimator2013-12-181-3/+3
| * net/server_select: Check arguments to add_server correctlydaurnimator2013-12-181-3/+4
* | Merge 0.10->trunkMatthew Wild2015-09-027-19/+27
|\|
| * configure, Makefile: Make compatible with plain Bourne shell as used on Solar...Matthew Wild2015-09-022-9/+9
| * storagemanager: Check if drivers support purging, warn otherwiseKim Alvefur2015-09-021-3/+8
| * prosody: Set a luasocket global, fixes undefined global access in loop() (pen...Kim Alvefur2015-09-021-0/+1
| * storagemanager: Export purge (fixes deleting users from usermanager) (thanks mt)Kim Alvefur2015-09-021-0/+1
| * util.sql: Export db2uri (mod_storage_sql2 command uses it) (thanks mike)Kim Alvefur2015-09-021-0/+1
| * util.sql: Log when transactions beginKim Alvefur2015-08-301-0/+1
| * 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
* | 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
* | Merge 0.10->trunkKim Alvefur2015-08-262-1/+18
|\|
| * 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
* | | Merge 0.10->trunkKim Alvefur2015-08-221-1/+1
|\| |
| * | mod_websocket: Import sessionmanager (fixes traceback)Kim Alvefur2015-08-211-1/+1
* | | storagemanager: Add forward declaration to fix use of open() before it's definedKim Alvefur2015-08-201-1/+4
* | | Merge 0.10->trunkKim Alvefur2015-08-2065-502/+739
|\| |
| * | 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
* | | MUC: Fix logic errorKim Alvefur2015-08-171-1/+1
* | | Merge 0.10->trunkKim Alvefur2015-08-114-37/+46
|\| |
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 04:08:35 +0000