aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.11->trunkKim Alvefur2018-11-272-2/+3
|\
| * mod_csi: Set session.state to simplify CSI modulesKim Alvefur2018-11-272-2/+1
| * mod_csi_simple: Fix autocompletion mistakeKim Alvefur2018-11-271-1/+1
| * mod_csi_simple: Bypass importance event in active mode (fixes #1249)Kim Alvefur2018-11-271-1/+3
| * mod_csi_simple: Don't set <delay> stamps on <iq> stanzas (fixes #1248)Kim Alvefur2018-11-271-1/+1
* | MUC: Move check for explicit room join earlier in room creation flowKim Alvefur2018-11-272-8/+1
* | Merge 0.11->trunkKim Alvefur2018-11-262-2/+8
|\|
| * Merge 0.10->0.11Kim Alvefur2018-11-261-1/+7
| |\
| | * mod_proxy65: Check what port is used at the time of the queryKim Alvefur2018-11-251-1/+1
| | * mod_proxy65: Return an error if no port is open (fixes #1240)Kim Alvefur2018-11-251-0/+6
| * | mod_csi_simple: Use the same event name when firing as when hooking (fixes #1...Kim Alvefur2018-11-251-1/+1
* | | Merge 0.11->trunkKim Alvefur2018-11-253-12/+6
|\| |
| * | MUC: Fix traceback on muc#admin query with missing <item> child (#1242)Kim Alvefur2018-11-251-0/+1
| * | Added tag 0.11.0 for changeset 83f3a05c1b1bMatthew Wild2018-11-180-0/+0
| * | CHANGES: Update with release dateMatthew Wild2018-11-181-1/+1
| * | prosody.cfg.lua.dist: Tidy up some commentsMatthew Wild2018-11-181-11/+1
| * | prosody.cfg.lua.dist: Add https_certificate optionMatthew Wild2018-11-181-0/+3
* | | Merge 0.11->trunkKim Alvefur2018-11-181-1/+1
|\| |
| * | net.server_select: Fix IP validation to use correct variable (thanks quest)Kim Alvefur2018-11-171-1/+1
* | | Merge 0.11->trunkKim Alvefur2018-11-173-4/+30
|\| |
| * | mod_csi_simple: Consider non-stanza objects importantKim Alvefur2018-11-171-0/+3
| * | mod_csi_simple: Skip delay tags on objects other than stanzas (thanks quest)Kim Alvefur2018-11-171-2/+4
| * | util.stanza: Validate input to clone() (with brief tests)Kim Alvefur2018-11-172-2/+23
* | | Merge 0.11->trunkMatthew Wild2018-11-151-4/+4
|\| |
| * | mod_storage_sql: Catch errors during schema upgrade (thanks Nothing4You)Matthew Wild2018-11-151-4/+4
* | | Merge 0.11->trunkMatthew Wild2018-11-151-12/+18
|\| |
| * | MUC: Use defaults from config in create_room() if no config providedMatthew Wild2018-11-151-12/+18
* | | 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