aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mod_bosh: Some additonal comments to improve code readabilityMatthew Wild2018-04-101-1/+3
* mod_bosh: WhitespaceMatthew Wild2018-04-101-1/+0
* mod_bosh: Improve logging - parse errors will now log through the session log...Matthew Wild2018-04-101-1/+2
* mod_bosh: Improve logging on session close (reason may be a table with params)Matthew Wild2018-04-101-1/+1
* Merge 0.10->trunkKim Alvefur2018-04-101-6/+3
|\
| * mod_blocklist: Allow mod_presence to handle subscription stanzas before bounc...Kim Alvefur2018-04-061-6/+3
* | mod_register_limits: Promote log message about inability to apply black/white...Kim Alvefur2018-04-101-1/+1
* | mod_register_limits: Change debug message wording, there's no user yetKim Alvefur2018-04-101-1/+1
* | mod_register_limits: Use existing local variableKim Alvefur2018-04-101-2/+2
* | mod_register_ibr: Return a textual error to the user for problems with parsin...Kim Alvefur2018-04-091-1/+3
* | mod_register_ibr: Reshape the code using early returns to reduce needless ind...Kim Alvefur2018-04-071-58/+71
* | util.ringbuffer: Fix typo in comment [codespell]Kim Alvefur2018-04-061-1/+1
* | util.startup/prosodyctl: Delay enabling global protection until last (silence...Kim Alvefur2018-04-061-1/+1
* | util.startup: Fix traceback due to both plugin path becoming nil if plugin_pa...Kim Alvefur2018-04-061-1/+1
* | net.connlisteners: Remove duplicated field in exports [luacheck]Kim Alvefur2018-04-061-1/+0
* | Merge 0.10->trunkKim Alvefur2018-04-061-0/+1
|\|
| * net.http: Import setmetatable into local scope (fixes #1125)Kim Alvefur2018-04-061-0/+1
* | mod_ping: Ignore unused arguments [luacheck]Kim Alvefur2018-04-061-1/+1
* | Fix spelling throughout the codebase [codespell]Kim Alvefur2018-02-0417-35/+35
* | luacheckrc: No longer ignore use of the global 'server' (net.server)Kim Alvefur2018-04-051-1/+0
* | prosody: Get net.server via requre to avoid relying on globalsKim Alvefur2018-04-051-0/+1
* | mod_muc_mam: Save the MUC <x> on recorded join stanzasKim Alvefur2018-03-241-1/+1
* | mod_muc_mam: Let muc/history.lib decide which messages to storeKim Alvefur2018-03-241-4/+2
* | mod_muc_mam: Remove 0.10 compat codeKim Alvefur2017-12-121-97/+4
* | mod_muc_mam: Import mod_mam_muc from prosody-modules ba6466fa6823Kim Alvefur2018-04-022-0/+463
* | util.startup: Set up event hooks for reloading logging here instead of in log...Kim Alvefur2018-04-052-7/+6
* | util.startup: Initialize prosody.log / _G.log here instead of in loggingmanag...Kim Alvefur2018-04-052-4/+5
* | util.startup: Initialize logging earlier, so that messages from eg net.server...Kim Alvefur2018-04-051-1/+1
* | prosodyctl: Use prosody.hosts instead of _G.hostsKim Alvefur2018-03-291-8/+8
* | core: Use prosody.hosts instead of _G.hosts for consistencyKim Alvefur2018-03-295-5/+5
* | luacheckrc: Forget about _G.hosts, things should use _G.prosody.hostsKim Alvefur2018-03-291-2/+0
* | util.startup: Access the hosts table via the prosody global for consistencyKim Alvefur2018-03-291-1/+1
* | prosody: Use prosody.log instead of _G.log because it looks nicerKim Alvefur2018-04-051-5/+5
* | util.startup: Use own logger instead of the possibly not available yet _G.logKim Alvefur2018-04-051-0/+1
* | util.startup: Remove luacheck directive for ignoring use of _G.log which migh...Kim Alvefur2018-04-051-3/+0
* | net.server: Init a local logger (fixes traceback on attempt to warn about mis...Kim Alvefur2018-04-051-0/+1
* | luacheckrc: Remove allowance for the global log() since it may not exist as e...Kim Alvefur2018-04-051-1/+0
* | Merge 0.10 -> trunkMatthew Wild2018-04-041-2/+1
|\|
| * CHANGES: Normalize syntaxKim Alvefur2018-04-031-2/+1
* | Merge 0.10 -> trunkMatthew Wild2018-04-041-1/+1
|\|
| * net.http: Fix parameter order to http request callbacksMatthew Wild2018-04-041-1/+1
| * MUC: Don't reply to errors with more errors (fixes #1122)Kim Alvefur2018-03-281-1/+3
| * MUC: Say something about storage failure before aborting (see #1091)Kim Alvefur2018-03-121-0/+1
| * MUC: Prevent creation of room that could not be loaded from storage (see #1091)Kim Alvefur2018-03-091-2/+8
| * MUC: Abort module loading if unable to get list of persistent rooms from stor...Kim Alvefur2018-03-071-1/+5
* | prosodyctl: Increase robustness in luarocks version detection (fixes #1003)Kim Alvefur2018-03-301-3/+9
* | Backed out changeset a0f728c3aa69 in favor of 580c13ed0ca1Kim Alvefur2018-03-291-7/+3
* | util.startup: Initialize the 'prosody' global earlier (various things needs t...Kim Alvefur2018-03-291-2/+2
* | util.startup: Factor out processing of plugin and data paths into a separate ...Kim Alvefur2018-03-291-9/+20
* | util.json: Unescape surrogate pairsMatthew Wild2018-03-271-4/+5