aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.11->trunkMatthew Wild2018-11-131-1/+1
|\
| * net.http.server: Move event formation to avoid traceback on missing Host headerMatthew Wild2018-11-131-1/+1
* | Merge 0.11->trunkKim Alvefur2018-11-121-1/+3
|\|
| * spec/scansion/prosody.cfg.lua: Add comment about mod_scansion_recordKim Alvefur2018-11-121-1/+3
* | Merge 0.11->trunkKim Alvefur2018-11-123-3/+114
|\|
| * MUC: Add scanison test case for #1230Kim Alvefur2018-11-122-0/+102
| * mod_scansion_record: Split stanzas into multiple linesKim Alvefur2018-11-121-1/+3
| * mod_scansion_record: Discard from/to where these are implicitly the sessions ...Kim Alvefur2018-11-121-2/+9
* | Merge 0.11->trunkKim Alvefur2018-11-111-5/+4
|\|
| * util.sql: Switch from hacky multi-arg xpcall implementation to util.xpcallKim Alvefur2018-11-111-5/+4
* | MUC: Fix spelling in commentsKim Alvefur2018-11-101-5/+5
* | Merge 0.11->trunkKim Alvefur2018-11-092-4/+8
|\|
| * MUC: Allow anyone read access to all affiliation lists in non-anonymous rooms...Kim Alvefur2018-11-091-1/+1
| * MUC: Clarify condition with parenthesisKim Alvefur2018-11-091-2/+2
| * net.http: Manually merge settings (fixes #1231)Kim Alvefur2018-11-091-2/+6
* | Merge 0.11->trunkKim Alvefur2018-11-073-1/+10
|\|
| * mod_storage_memory: Support the purge driver methodKim Alvefur2018-11-071-0/+6
| * mod_register: Move dependency on mod_register_limits into mod_register_ibrKim Alvefur2018-11-072-1/+4
* | mod_pep: Remove incorrect features advertised on the bare hostKim Alvefur2018-11-011-3/+0
* | Merge 0.11->trunkMatthew Wild2018-10-314-3/+35
|\|
| * issue1224.scs: Fix to expect new affiliation change notificationsMatthew Wild2018-10-311-0/+7
| * issue1224.scs: Update titleMatthew Wild2018-10-311-1/+1
| * MUC: Add luacheck annotation for unused parameter in filter functionMatthew Wild2018-10-311-1/+1
| * muc_affiliation_notify.scs: Remove trailing whitespaceMatthew Wild2018-10-311-1/+1
| * muc_register.scs: Fix to expect new affiliation change notificationsMatthew Wild2018-10-311-0/+25
* | Merge 0.11->trunkMatthew Wild2018-10-313-12/+169
|\|
| * MUC: Announce affiliation changes for JIDs that are not in the roomMatthew Wild2018-10-313-12/+169
* | Merge 0.11->trunkKim Alvefur2018-10-303-2/+207
|\|
| * pubsub: Set pubsub#title as name attribute in disco#items (fixes #1226)Kim Alvefur2018-10-303-2/+207
* | Merge 0.11->trunkMatthew Wild2018-10-304-2/+317
|\|
| * spec/scansion: Add pep_publish_subscribe (fixes #1222)Matthew Wild2018-10-301-0/+210
| * prosody.cfg.lua.dist: Replace old vcard module with new onesKim Alvefur2018-10-291-1/+2
| * prosody.cfg.lua.dist: Add mod_muc_mam to example MUC sectionKim Alvefur2018-10-291-0/+2
| * prosody.cfg.lua.dist: Mention that mod_pep handles avatarsKim Alvefur2018-10-291-1/+1
| * prosody.cfg.lua.dist: Add mod_csi_simpleKim Alvefur2018-10-291-0/+1
| * mod_csi_simple: Import modified version of mod_csi_pump from prosody-modulesKim Alvefur2018-10-292-1/+101
| * CHANGES: Mention mod_csiKim Alvefur2018-10-291-0/+1
* | net.server_epoll: Use method to update peername on connectKim Alvefur2018-10-291-3/+1
* | net.server_epoll: Reschedule delayed timers relative to current timeKim Alvefur2018-10-281-3/+7
* | Merge 0.11->trunkKim Alvefur2018-10-283-418/+4
|\|
| * mod_storage_sql1: Remove pre-0.10 SQL moduleKim Alvefur2018-10-281-414/+0
| * util.sslconfig: Recognise TLS 1.3 as a protocol versionKim Alvefur2018-10-281-1/+1
| * CHANGES: Update with new branchKim Alvefur2018-10-281-3/+3
| * Diverge 0.11Kim Alvefur2018-10-280-0/+0
* | net.server: Add an API for holding writes of outgoing dataKim Alvefur2018-10-253-14/+50
* | net.server_select: Still allow buffering outgoing data on write-locked connec...Kim Alvefur2018-10-281-4/+1
* | net.server_select: Replace use of deprecated :lock_read in server.linkKim Alvefur2018-10-281-2/+2
* | net.server_select: Deprecate :lock methodKim Alvefur2018-10-281-0/+1
* | server_select: Fix :lock methodKim Alvefur2018-10-281-1/+1
* | net.server_select: Move code from :lock_read into :pause and :resumeKim Alvefur2018-10-281-13/+15