aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-10-077-42/+58
|\
| * mod_s2s: Log error message from DNS lookupKim Alvefur2016-10-041-0/+4
| * MUC: Return 'true' from room:destroy() so that use from the telnet console sa...Kim Alvefur2016-10-011-0/+1
| * Makefile: Preserve timestamps of installed files (fixes #547)Kim Alvefur2016-10-011-1/+1
| * Makefile: Refactor all uses of the install command with variables, allowing t...Kim Alvefur2016-10-011-26/+32
| * Makefile: Use install to copy plugins that live in subdirectories instead of ...Kim Alvefur2016-10-011-1/+6
| * Makefile: Use more specific globbing for util.sasl.* (like 5a60b4705bc3)Kim Alvefur2016-10-011-1/+1
| * Merge 0.9->0.10Kim Alvefur2016-09-282-3/+3
| |\
| | * Tagging 0.9.11Matthew Wild2016-09-270-0/+0
| | * mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered p...0.9.11Matthew Wild2016-09-271-1/+1
| | * prosodyctl: Fix copy/paste error in help text for deluser commandMatthew Wild2016-09-271-2/+2
| | * util.dependencies: Set global 'ssl' for compat with LuaSec 0.6 (fixes #749)Kim Alvefur2016-09-231-0/+3
| * | util.datamanager: Add annotations to ignore name clashes [luacheck]Kim Alvefur2016-09-241-5/+5
| * | util.datamanager: Rename variables to avoid name clashes [luacheck]Kim Alvefur2016-09-241-12/+12
| * | mod_carbons: Fix inverted logic (Thanks Ge0rg)}Kim Alvefur2016-09-231-1/+1
| * | mod_carbons: Compare with correct variableKim Alvefur2016-09-231-1/+1
| * | mod_carbons: Make the conditions for ignoring MUC PMs more specific (fixes #744)Kim Alvefur2016-09-232-3/+3
* | | MUC: Remove "server changed your nickname" status code, it gets into the wron...Kim Alvefur2016-10-011-5/+0
* | | MUC: Fix logic of nickname override detection (thanks mimi89999)Kim Alvefur2016-10-011-2/+2
* | | MUC: Insert the appropriate status code (210) if the nickname is overriddenKim Alvefur2016-09-291-0/+6
* | | Merge 0.10->trunkMatthew Wild2016-09-125-18/+20
|\| |
| * | mod_component: Fire 'component-disconnected' event on host, to maintain consi...Matthew Wild2016-09-121-1/+3
| * | core.statsmanager: Use correct variable for config validation [luacheck]Kim Alvefur2016-09-121-1/+1
| * | core.certmanager: Split cipher list into array with comments explaining each ...Kim Alvefur2016-09-121-1/+10
| * | mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate o...Kim Alvefur2016-09-122-15/+6
* | | MUC: Fix conflict when restoring room where the same bare JID has joined as m...Kim Alvefur2016-09-111-25/+10
* | | Merge 0.10->trunkMatthew Wild2016-09-071-1/+2
|\| |
| * | mod_bosh: Save last response in case retransmission is requiredSam Whited2016-09-071-1/+2
* | | net.server_epoll: Make minimum poll wait time configurableKim Alvefur2016-09-041-4/+7
* | | net.server_epoll: Support for setting configuration parametersKim Alvefur2016-09-041-2/+6
* | | mod_bosh: Update BOSH wait timeout logic to work despite the addition of defe...Matthew Wild2016-09-021-3/+4
* | | mod_bosh: Fix typoMatthew Wild2016-09-021-1/+1
* | | Merge 0.10->trunkMatthew Wild2016-09-021-20/+60
|\| |
| * | mod_bosh: Make 'hold' and 'requests' fixed to '1' and '2' respectively, as th...Matthew Wild2016-09-021-11/+17
| * | mod_bosh: Log when a stanza isn't handled because we can't find a session for itMatthew Wild2016-09-021-0/+2
| * | mod_bosh: Correctly handle requests arriving out of order (thanks Jitsi folk!)Matthew Wild2016-09-021-10/+42
* | | Logging error if MUC room cache is fullSam Whited2016-09-021-3/+3
* | | Merge 0.10->trunkMatthew Wild2016-08-311-1/+6
|\| |
| * | stanza_router: Make 'unhandled stanza' errors more informativeMatthew Wild2016-08-311-1/+6
* | | Merge 0.10->trunkMatthew Wild2016-08-313-7/+11
|\| |
| * | moduleapi: 'duration' became 'times'Matthew Wild2016-08-311-1/+1
| * | storagemanager: Fix for previous commitMatthew Wild2016-08-311-1/+1
| * | storagemanager: Fire event when opening a store, and allow the returned store...Matthew Wild2016-08-311-0/+5
| * | storagemanager: Simplify function flowMatthew Wild2016-08-311-5/+5
| * | Backed out changeset a23b5cb8c22bMatthew Wild2016-08-311-1/+0
* | | MUC: Restore modern version of public create_room() function removed in dfaac...Kim Alvefur2016-08-301-0/+12
* | | mod_admin_telnet: Fix to use modern way to fetch a MUC roomKim Alvefur2016-08-301-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-08-281-0/+1
|\| |
| * | mod_s2s: Fire event when s2s connection failsMatthew Wild2016-08-271-0/+1
* | | net.server_epoll: More commentsKim Alvefur2016-08-271-2/+27