Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.11->trunk | Matthew Wild | 2018-11-15 | 1 | -12/+18 |
|\ | |||||
| * | MUC: Use defaults from config in create_room() if no config provided | Matthew Wild | 2018-11-15 | 1 | -12/+18 |
| | | |||||
* | | Merge 0.11->trunk | Matthew Wild | 2018-11-13 | 1 | -1/+1 |
|\| | |||||
| * | net.http.server: Move event formation to avoid traceback on missing Host header | Matthew Wild | 2018-11-13 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-11-12 | 1 | -1/+3 |
|\| | |||||
| * | spec/scansion/prosody.cfg.lua: Add comment about mod_scansion_record | Kim Alvefur | 2018-11-12 | 1 | -1/+3 |
| | | | | | | | | | | This was accidentally included in a previous commit, but having it here makes it easier to enable when making new test cases. | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-11-12 | 3 | -3/+114 |
|\| | |||||
| * | MUC: Add scanison test case for #1230 | Kim Alvefur | 2018-11-12 | 2 | -0/+102 |
| | | |||||
| * | mod_scansion_record: Split stanzas into multiple lines | Kim Alvefur | 2018-11-12 | 1 | -1/+3 |
| | | | | | | | | Not perfect but should improve readability somewhat | ||||
| * | mod_scansion_record: Discard from/to where these are implicitly the sessions ↵ | Kim Alvefur | 2018-11-12 | 1 | -2/+9 |
| | | | | | | | | | | | | full JID Makes it easier to clean up recordings and change JIDs etc | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-11-11 | 1 | -5/+4 |
|\| | |||||
| * | util.sql: Switch from hacky multi-arg xpcall implementation to util.xpcall | Kim Alvefur | 2018-11-11 | 1 | -5/+4 |
| | | |||||
* | | MUC: Fix spelling in comments | Kim Alvefur | 2018-11-10 | 1 | -5/+5 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-11-09 | 2 | -4/+8 |
|\| | |||||
| * | MUC: Allow anyone read access to all affiliation lists in non-anonymous ↵ | Kim Alvefur | 2018-11-09 | 1 | -1/+1 |
| | | | | | | | | rooms (fixes #1230) | ||||
| * | MUC: Clarify condition with parenthesis | Kim Alvefur | 2018-11-09 | 1 | -2/+2 |
| | | |||||
| * | net.http: Manually merge settings (fixes #1231) | Kim Alvefur | 2018-11-09 | 1 | -2/+6 |
| | | | | | | | | Metatable table indexing is done raw, so metatables can't be chained | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-11-07 | 3 | -1/+10 |
|\| | |||||
| * | mod_storage_memory: Support the purge driver method | Kim Alvefur | 2018-11-07 | 1 | -0/+6 |
| | | |||||
| * | mod_register: Move dependency on mod_register_limits into mod_register_ibr | Kim Alvefur | 2018-11-07 | 2 | -1/+4 |
| | | |||||
* | | mod_pep: Remove incorrect features advertised on the bare host | Kim Alvefur | 2018-11-01 | 1 | -3/+0 |
| | | |||||
* | | Merge 0.11->trunk | Matthew Wild | 2018-10-31 | 4 | -3/+35 |
|\| | |||||
| * | issue1224.scs: Fix to expect new affiliation change notifications | Matthew Wild | 2018-10-31 | 1 | -0/+7 |
| | | |||||
| * | issue1224.scs: Update title | Matthew Wild | 2018-10-31 | 1 | -1/+1 |
| | | |||||
| * | MUC: Add luacheck annotation for unused parameter in filter function | Matthew Wild | 2018-10-31 | 1 | -1/+1 |
| | | |||||
| * | muc_affiliation_notify.scs: Remove trailing whitespace | Matthew Wild | 2018-10-31 | 1 | -1/+1 |
| | | |||||
| * | muc_register.scs: Fix to expect new affiliation change notifications | Matthew Wild | 2018-10-31 | 1 | -0/+25 |
| | | |||||
* | | Merge 0.11->trunk | Matthew Wild | 2018-10-31 | 3 | -12/+169 |
|\| | |||||
| * | MUC: Announce affiliation changes for JIDs that are not in the room | Matthew Wild | 2018-10-31 | 3 | -12/+169 |
| | | |||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-10-30 | 3 | -2/+207 |
|\| | |||||
| * | pubsub: Set pubsub#title as name attribute in disco#items (fixes #1226) | Kim Alvefur | 2018-10-30 | 3 | -2/+207 |
| | | |||||
* | | Merge 0.11->trunk | Matthew Wild | 2018-10-30 | 4 | -2/+317 |
|\| | |||||
| * | spec/scansion: Add pep_publish_subscribe (fixes #1222) | Matthew Wild | 2018-10-30 | 1 | -0/+210 |
| | | |||||
| * | prosody.cfg.lua.dist: Replace old vcard module with new ones | Kim Alvefur | 2018-10-29 | 1 | -1/+2 |
| | | |||||
| * | prosody.cfg.lua.dist: Add mod_muc_mam to example MUC section | Kim Alvefur | 2018-10-29 | 1 | -0/+2 |
| | | |||||
| * | prosody.cfg.lua.dist: Mention that mod_pep handles avatars | Kim Alvefur | 2018-10-29 | 1 | -1/+1 |
| | | |||||
| * | prosody.cfg.lua.dist: Add mod_csi_simple | Kim Alvefur | 2018-10-29 | 1 | -0/+1 |
| | | |||||
| * | mod_csi_simple: Import modified version of mod_csi_pump from prosody-modules | Kim Alvefur | 2018-10-29 | 2 | -1/+101 |
| | | |||||
| * | CHANGES: Mention mod_csi | Kim Alvefur | 2018-10-29 | 1 | -0/+1 |
| | | |||||
* | | net.server_epoll: Use method to update peername on connect | Kim Alvefur | 2018-10-29 | 1 | -3/+1 |
| | | |||||
* | | net.server_epoll: Reschedule delayed timers relative to current time | Kim Alvefur | 2018-10-28 | 1 | -3/+7 |
| | | | | | | | | | | This should normally never happen, but can be reproduced by suspending the process a while. | ||||
* | | Merge 0.11->trunk | Kim Alvefur | 2018-10-28 | 3 | -418/+4 |
|\| | |||||
| * | mod_storage_sql1: Remove pre-0.10 SQL module | Kim Alvefur | 2018-10-28 | 1 | -414/+0 |
| | | |||||
| * | util.sslconfig: Recognise TLS 1.3 as a protocol version | Kim Alvefur | 2018-10-28 | 1 | -1/+1 |
| | | | | | | | | This enables it to understand protocol = "tlsv1_3+" | ||||
| * | CHANGES: Update with new branch | Kim Alvefur | 2018-10-28 | 1 | -3/+3 |
| | | |||||
| * | Diverge 0.11 | Kim Alvefur | 2018-10-28 | 0 | -0/+0 |
| | | |||||
* | | net.server: Add an API for holding writes of outgoing data | Kim Alvefur | 2018-10-25 | 3 | -14/+50 |
| | | |||||
* | | net.server_select: Still allow buffering outgoing data on write-locked ↵ | Kim Alvefur | 2018-10-28 | 1 | -4/+1 |
| | | | | | | | | connections | ||||
* | | net.server_select: Replace use of deprecated :lock_read in server.link | Kim Alvefur | 2018-10-28 | 1 | -2/+2 |
| | | |||||
* | | net.server_select: Deprecate :lock method | Kim Alvefur | 2018-10-28 | 1 | -0/+1 |
| | | | | | | | | Exists only in server_select and I found nothing using it |