aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MUC: Include the appropriate status code if nickname is changed during join p...Kim Alvefur2016-10-261-2/+18
* mod_muc/muc.lib: Allow passing different <x> elements to be passed to :public...Kim Alvefur2016-10-261-4/+5
* Merge 0.10->trunkKim Alvefur2016-10-185-12/+13
|\
| * util.pubsub: Rename loop variable to avoid name clash [luacheck]Kim Alvefur2016-10-181-5/+5
| * util.cache: Ignore unused argument [luacheck]Kim Alvefur2016-10-181-0/+1
| * util.statsd: Ignore unused argument [luacheck]Kim Alvefur2016-10-181-1/+1
| * util.array: Remove unused arguments [luacheck]Kim Alvefur2016-10-181-1/+1
| * util.array: Rename arguments to avoid name clash [luacheck]Kim Alvefur2016-10-181-4/+4
| * mod_carbons: Fix logic presendenceKim Alvefur2016-10-171-1/+1
* | Merge 0.10->trunkKim Alvefur2016-10-161-33/+24
|\|
| * util.pubsub: Factor item storage cache into a per service configurable optionKim Alvefur2016-10-161-3/+4
| * util.pubsub: Switch to use util.cache for item dataKim Alvefur2016-10-161-33/+23
* | MUC: Run component shutdown after mod_c2s has closed its sessions (prevents g...Kim Alvefur2016-10-151-1/+1
* | Merge 0.10->trunkKim Alvefur2016-10-131-3/+1
|\|
| * certs/localhost.cnf: Make localhost.crt self-signed (thanks jonas)Kim Alvefur2016-10-131-3/+1
* | net.server_epoll: Check that connection still exists after callback, fixes tr...Kim Alvefur2016-10-091-0/+1
* | Merge 0.10->trunkKim Alvefur2016-10-082-4/+8
|\|
| * Makefile: Fix installing modules into their correct subdirectories (thanks mi...Kim Alvefur2016-10-081-4/+4
| * net.server_event: Restore destruction of socket on read timeout (lost since e...Kim Alvefur2016-10-081-0/+4
* | net.server_epoll: Separate ok from err branch moreKim Alvefur2016-10-071-14/+19
* | 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