aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-09-227-39/+80
|\
| * sessionmanager: Make session.send() return true unless there really is an errorKim Alvefur2015-09-211-1/+7
| * plugins: Explicitly return to halt event propagation (session.send sometimes ...Kim Alvefur2015-09-215-37/+74
| * Makefile: Fix building prosody.version (.hg/dirstate is a file, not a directory)Kim Alvefur2015-09-211-1/+1
* | Merge 0.10->trunkKim Alvefur2015-09-192-11/+23
|\|
| * mod_admin_telnet: Fix indentationKim Alvefur2015-09-181-5/+5
| * prosodyctl: Move files out of the way when generating new cert or keyKim Alvefur2015-09-191-6/+18
* | util.timer: Fix indentationKim Alvefur2015-09-181-6/+6
* | Merge 0.10->trunkKim Alvefur2015-09-174-44/+48
|\|
| * mod_offline: Decrease priority of event handlers so 3rd party hooks fire firs...Kim Alvefur2015-09-161-2/+2
| * mod_blocklist: Explicitly halt event propagation after returning a reply (sen...Kim Alvefur2015-09-161-6/+12
| * mod_tls: Fix inhertinance of 'ssl' option from "parent" host to subdomain (fi...Kim Alvefur2015-09-151-10/+12
| * MUC: Break a very long lineKim Alvefur2015-09-121-2/+4
| * util.dataforms: Fix interaction of required fields and empty string values (f...Kim Alvefur2015-09-121-3/+4
| * util.dataforms: Refactor parsing to reuse simple text parser instead of dupli...Kim Alvefur2015-09-121-26/+21
* | 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 (th...Kim Alvefur2015-09-151-1/+1
* | Merge 0.10->trunkMatthew Wild2015-09-042-2/+7
|\|
| * tests/run_tests.sh: Let status code propagate to shellMatthew Wild2015-09-041-1/+1
| * tests: Return status code depending on whether tests passedMatthew Wild2015-09-041-1/+6
| * net/http: Use server.addclientdaurnimator2013-12-181-11/+6
* | Merge 0.10->trunkKim Alvefur2015-09-031-0/+1
|\|
| * util.stanza: Export xml_escape (missed during removal of module() calls)Kim Alvefur2015-09-031-0/+1
* | 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
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 08:34:11 +0000