Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-08-18 | 2 | -1/+4 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-08-18 | 1 | -0/+3 |
| |\ | |||||
| | * | mod_http: Allow configuring http parser size limits | Kim Alvefur | 2016-08-18 | 1 | -0/+3 |
| | | | |||||
| | * | mod_privacy: Fix selecting the top resource (fixes #694) | Kim Alvefur | 2016-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | mod_register: Fix inverted throttle check (fixes #724) | Kim Alvefur | 2016-08-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-08-12 | 1 | -1/+3 |
|\| | | |||||
| * | | mod_s2s: Set read mode for s2sout sockets to the same as s2sins | Kim Alvefur | 2016-08-12 | 1 | -1/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-08-08 | 2 | -5/+8 |
|\| | | |||||
| * | | mod_c2s: Don't try to keep alive sessions where the stream is not (yet) open | Kim Alvefur | 2016-08-07 | 1 | -1/+4 |
| | | | |||||
| * | | mod_c2s: Fix whitespace (why does it keep getting messed up?) | Kim Alvefur | 2016-08-07 | 1 | -3/+3 |
| | | | |||||
| * | | mod_s2s: Index session after checking if it exists (fixes traceback in case ↵ | Kim Alvefur | 2016-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | of a connection without a session having a read timeout) | ||||
* | | | MUC: Pass room JID instead of room itself to logger, fixes traceback (thanks ↵ | Kim Alvefur | 2016-08-06 | 1 | -1/+1 |
| | | | | | | | | | | | | damencho) | ||||
* | | | mod_http: Fix indentation in redir_handler | Emmanuel Gil Peyrot | 2016-07-24 | 1 | -3/+3 |
| | | | |||||
* | | | mod_bosh: Fix merge mistakes from c8923f882274 | Kim Alvefur | 2016-07-14 | 1 | -5/+18 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-07-14 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_net_multiplex: remove unused one-letter loop variable [luacheck] | Anton Shestakov | 2016-07-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-07-13 | 2 | -11/+18 |
|\| | | |||||
| * | | mod_http_errors: Add a newline after end of HTML | Kim Alvefur | 2016-07-12 | 1 | -1/+2 |
| | | | |||||
| * | | mod_http_files: Send larger files using new file handle API | Kim Alvefur | 2016-07-11 | 1 | -7/+12 |
| | | | |||||
| * | | mod_http_files: Switch to use util.cache for cache | Kim Alvefur | 2016-07-11 | 1 | -3/+4 |
| | | | |||||
| * | | mod_http_files: send valid ETag header | Anton Shestakov | 2016-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | RFC 2616 section 14 (header field definitions) shows that ETag header content should be wrapped in double quotes. | ||||
* | | | MUC: Hide new MUC room storage format behind an off-by-default option | Kim Alvefur | 2016-07-09 | 1 | -6/+17 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-07-08 | 2 | -4/+3 |
|\| | | |||||
| * | | mod_admin_telnet: remove unused import (util.serialization) [luacheck] | Anton Shestakov | 2016-07-09 | 1 | -1/+0 |
| | | | |||||
| * | | mod_admin_telnet: rename variable to make it defined (room -> room_name) | Anton Shestakov | 2016-07-09 | 1 | -2/+2 |
| | | | |||||
| * | | mod_presence: remove unused one-letter loop variable [luacheck] | Anton Shestakov | 2016-07-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-07-08 | 2 | -0/+20 |
|\| | | |||||
| * | | mod_c2s, mod_s2s: Bootstrap connection count statistic on module load | Kim Alvefur | 2016-07-07 | 2 | -0/+20 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-06-12 | 1 | -3/+2 |
|\| | | |||||
| * | | mod_pep: Use correct field for full JID (thanks Milan*) | Kim Alvefur | 2016-06-10 | 1 | -1/+1 |
| | | | |||||
| * | | mod_pep: Include the bare user jid in event | Kim Alvefur | 2016-06-09 | 1 | -3/+2 |
| | | | |||||
* | | | mod_s2s: Add util.async support | Kim Alvefur | 2016-05-30 | 1 | -9/+37 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-30 | 1 | -3/+0 |
|\| | | |||||
| * | | mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2 | Kim Alvefur | 2016-05-30 | 1 | -3/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-28 | 1 | -1/+2 |
|\| | | |||||
| * | | MUC: Allow members (or above) in members-only non-anonymous rooms to see the ↵ | Kim Alvefur | 2016-05-28 | 1 | -1/+2 |
| | | | | | | | | | | | | member list (fixes #445) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-05-22 | 1 | -0/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-05-22 | 1 | -0/+1 |
| |\| | |||||
| | * | mod_presence: Re-probe for contacts presence after outgoing 'subscribed' ↵ | Kim Alvefur | 2016-05-21 | 1 | -0/+1 |
| | | | | | | | | | | | | (fixes #673) | ||||
* | | | MUC: Send participant list and subject on explicit joins (thanks daurnimator) | Kim Alvefur | 2016-05-15 | 1 | -2/+2 |
| | | | |||||
* | | | Backed out changeset 63141a85beea, broke multi-session nicks | Kim Alvefur | 2016-05-14 | 1 | -8/+3 |
| | | | |||||
* | | | MUC: Treat explicit join presence as join | Kim Alvefur | 2016-05-07 | 1 | -3/+8 |
| | | | |||||
* | | | MUC: Move status text out of <x> element (thanks Tobias) | Kim Alvefur | 2016-05-04 | 1 | -2/+2 |
| | | | |||||
* | | | MUC: Lower priority of hook so plugins hooks run before | Kim Alvefur | 2016-05-04 | 1 | -1/+1 |
| | | | |||||
* | | | MUC: Restore last message from state, not room config (missing change from ↵ | Kim Alvefur | 2016-04-30 | 1 | -3/+3 |
| | | | | | | | | | | | | cbb05b454c13) | ||||
* | | | MUC: Separate config from live state | Kim Alvefur | 2016-04-29 | 2 | -13/+22 |
| | | | |||||
* | | | MUC: Separate force-save parameter from save-entire-state flag | Kim Alvefur | 2016-04-29 | 2 | -10/+10 |
| | | | |||||
* | | | MUC: Stricter validation of deserialized data | Kim Alvefur | 2016-04-29 | 1 | -2/+2 |
| | | | |||||
* | | | MUC: Include the very last message in serialized form to keep it across ↵ | Kim Alvefur | 2016-04-28 | 1 | -0/+12 |
| | | | | | | | | | | | | eviction and restore | ||||
* | | | MUC: Add event for when room is done being created | Kim Alvefur | 2016-04-28 | 2 | -1/+7 |
| | | |