aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2016-01-041-0/+2
|\
| * mod_bosh: Fire event when BOSH session is createdMatthew Wild2016-01-041-0/+2
* | Merge 0.10->trunkMatthew Wild2016-01-042-4/+5
|\|
| * mod_admin_adhoc: Show only connections to/from the host the command was run onKim Alvefur2016-01-031-1/+1
| * mod_admin_adhoc: Remove extra ) that should not be thereKim Alvefur2016-01-031-1/+1
| * server_select: Forward the actual TLS handshake error messageKim Alvefur2016-01-031-2/+3
* | Merge 0.10->trunkMatthew Wild2016-01-023-0/+7
|\|
| * net.server_select: Close all connections when quitting (and not just stepping...Matthew Wild2016-01-021-0/+1
| * net.server_event: Add conn.type == 'server' for server sockets (fixes closeal...Matthew Wild2016-01-021-0/+1
| * util.events: Document data structuresMatthew Wild2015-12-231-0/+5
* | Merge 0.10->trunkKim Alvefur2016-01-011-1/+1
|\|
| * mod_register: Fix typoKim Alvefur2016-01-011-1/+1
* | Merge 0.10->trunkKim Alvefur2015-12-2711-129/+452
|\|
| * certs/Makefile: Fix generating cert from only a key (no config then)Kim Alvefur2015-12-241-2/+1
| * man prosodyctl: Add information about the 'about' and 'check' commandsKim Alvefur2015-12-232-0/+33
| * man prosodyctl: Add missing 'reload' commandKim Alvefur2015-12-232-1/+12
| * man prosodyctl: Accidentally markdownKim Alvefur2015-12-233-69/+213
| * Merge 0.9->0.10Kim Alvefur2015-12-231-2/+2
| |\
| | * certs/Makefile: Run key generation with a stricter umask (fixes a race condit...Kim Alvefur2015-12-231-2/+2
| | * mod_admin_telnet: Backport 06696882d972 from 0.10 (this command greatly helps...Matthew Wild2015-12-221-0/+27
| * | certs/Makefile: Add targets for any combination of already existing config, k...Kim Alvefur2015-12-231-3/+36
| * | mod_register: Support for blacklisting ips that are still over limit when the...Kim Alvefur2015-12-231-1/+7
| * | mod_register: Use util.cache to limit the number of per-ip throttles keptKim Alvefur2015-12-231-3/+6
| * | mod_register: Switch to using util.throttle for limiting registrations per ip...Kim Alvefur2015-12-231-13/+17
| * | tests: Add small test for util.throttleKim Alvefur2015-12-232-0/+35
| * | util.openssl: Fix style / whitespaceKim Alvefur2015-12-231-7/+7
| * | util.openssl: Rename variables for readabilityKim Alvefur2015-12-231-9/+9
| * | util.openssl: Move quoting and tostring call into escape functionKim Alvefur2015-12-231-3/+3
| * | util.array: Just use table.remove as array:pop()Kim Alvefur2015-12-231-5/+1
| * | util.array: Fix minory style issuesKim Alvefur2015-12-231-10/+10
| * | mod_register: Add comment explaining the workaround for replying when the acc...Kim Alvefur2015-12-211-0/+1
| * | mod_register: Use session log instance to ease indentificationKim Alvefur2015-12-211-4/+6
| * | util.cache (and tests): Call on_evict after insertion of the new key, so insi...Matthew Wild2015-12-222-5/+61
* | | util.timer: Reschedule timers from stop() if the next pending event is stoppedKim Alvefur2015-12-231-1/+10
* | | mod_admin_telnet: Make timer:info command more robustKim Alvefur2015-12-231-12/+17
* | | Merge 0.10->trunkMatthew Wild2015-12-163-5/+8
|\| |
| * | Merge 0.9->0.10Matthew Wild2015-12-161-1/+1
| |\|
| | * MUC: Fix incorrect nesting of status codes when room config changes (fixes #579)Matthew Wild2015-12-161-1/+2
| | * util.uuid: Remove unused importKim Alvefur2015-12-081-1/+0
| * | MergeMatthew Wild2015-12-163-48/+105
| |\ \
| | * | mod_storage_sql: Fix use of SQLite3 in-memory database (no path expansion)Kim Alvefur2015-12-151-1/+3
| * | | util.dependencies: Use prosody.log() instead of global log()Matthew Wild2015-12-161-4/+4
| * | | loggingmanager: Add prosody.log (intended to be used instead of _G.log now)Matthew Wild2015-12-111-0/+1
* | | | Merge 0.10->trunkKim Alvefur2015-12-131-31/+56
|\ \ \ \ | | |/ / | |/| |
| * | | util.sslconfig: More descriptive variable names and also commentsKim Alvefur2015-12-131-31/+56
* | | | Merge 0.10->trunkKim Alvefur2015-12-121-16/+46
|\| | |
| * | | util.datamanager: Add append to public apiKim Alvefur2015-12-111-0/+1
| * | | util.datamanager: Return extra location infoKim Alvefur2015-12-111-3/+3
| * | | util.datamanager: Make sure only strings are passed as data to append()Kim Alvefur2015-12-111-0/+1
| * | | util.datamanager: Add some comments about the append functionKim Alvefur2015-12-111-0/+3