aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2016-05-121-1/+1
|\
| * util.events: Fix comparison of event_name with nil instead of false (fixes #554)Matthew Wild2016-05-121-1/+1
* | MUC: Treat explicit join presence as joinKim Alvefur2016-05-071-3/+8
* | Merge 0.10->trunkKim Alvefur2016-05-042-6/+7
|\|
| * portmanager: Set default read size back to 4KKim Alvefur2016-05-041-1/+1
| * net.server_event: Schedule another read callback if there is still data left ...Kim Alvefur2016-05-041-1/+5
| * net.server_event: Collect entire one line function on one lineKim Alvefur2016-05-041-4/+1
* | MUC: Move status text out of <x> element (thanks Tobias)Kim Alvefur2016-05-041-2/+2
* | MUC: Lower priority of hook so plugins hooks run beforeKim Alvefur2016-05-041-1/+1
* | MUC: Restore last message from state, not room config (missing change from cb...Kim Alvefur2016-04-301-3/+3
* | MUC: Separate config from live stateKim Alvefur2016-04-292-13/+22
* | MUC: Separate force-save parameter from save-entire-state flagKim Alvefur2016-04-292-10/+10
* | MUC: Stricter validation of deserialized dataKim Alvefur2016-04-291-2/+2
* | MUC: Include the very last message in serialized form to keep it across evict...Kim Alvefur2016-04-281-0/+12
* | MUC: Add event for when room is done being createdKim Alvefur2016-04-282-1/+7
* | MUC: Split out handling of the room-creating presence into its own methodKim Alvefur2016-04-282-17/+58
* | MUC: Split out handling of normal (un)available presence into its own methodKim Alvefur2016-04-281-169/+175
* | MUC: Use a timestamp to keep track of when to unlock room instead of a timer ...Kim Alvefur2016-04-281-9/+7
* | MUC: Move the locked flag into persisted data (so not to lose it on eviction)Kim Alvefur2016-04-281-3/+3
* | MUC: Log cases of possible room resynchronisationKim Alvefur2016-04-281-0/+8
* | MUC: Be more careful with deserialization of rooms, fix case where a bare jid...Kim Alvefur2016-04-271-2/+2
* | MUC: Use correct room name variable, fixes traceback (thanks mathieui)Kim Alvefur2016-04-271-1/+1
* | MUC: Correctly iterate over suspended rooms while excluding live roomsKim Alvefur2016-04-261-1/+1
* | MUC: Don't force-save rooms where not neededKim Alvefur2016-04-201-2/+2
* | MUC: Assign priorities to config form hooks so they have a consistent order o...Kim Alvefur2016-04-1911-11/+11
* | Merge 0.10->trunkKim Alvefur2016-04-191-1/+1
|\|
| * Merge 0.9->0.10Kim Alvefur2016-04-191-1/+1
| |\
| | * net.server_event: Check the buffer *length*, not the buffer itself (Fixes 100...Kim Alvefur2016-04-191-1/+1
* | | MUC: Fix logic for when to broadcast unavailable presence (actual fix for 141...Kim Alvefur2016-04-191-2/+1
* | | MUC: Return item-not-found as error when attempting to change role of non-exi...Kim Alvefur2016-04-191-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-04-191-4/+3
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-04-191-4/+3
| |\|
| | * net.server_event: Return the correct value as timeoutKim Alvefur2016-04-191-1/+1
| | * net.server_event: Fix traceback if event re-added during starttlsKim Alvefur2016-04-191-4/+3
* | | mod_bosh: Add annotations to ignore unused arguments [luacheck]Kim Alvefur2016-04-191-2/+2
* | | mod_bosh: Remove unused imports (also mistake in merge)Kim Alvefur2016-04-191-2/+1
* | | mod_bosh: Fix imports that got lost in mergeKim Alvefur2016-04-191-0/+2
* | | Merge 0.10->trunkKim Alvefur2016-04-191-1/+1
|\| |
| * | mod_bosh: Don't decrement rid twice (thanks av6)Kim Alvefur2016-04-191-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-04-191-0/+4
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-04-192-0/+11
| |\|
| | * net.server_event: Re-add write event if writebuffer is non-empty after write ...Kim Alvefur2016-04-191-0/+4
| | * MUC: Accept missing form as "instant room" request (fixes #377)Kim Alvefur2016-04-191-0/+8
* | | Merge 0.10->trunkKim Alvefur2016-04-191-29/+41
|\| |
| * | mod_bosh: Reject fractional 'wait' (See #343)Kim Alvefur2016-04-191-1/+1
| * | mod_bosh: Return a proper BOSH error response from XML parse error callback (...Kim Alvefur2016-04-191-2/+3
| * | mod_bosh: Validate that 'sid' and 'wait' have sane values (fixes #475, also s...Kim Alvefur2016-04-191-3/+14
| * | mod_bosh: Validate 'to' host (see #343)Kim Alvefur2016-04-191-1/+9
| * | mod_bosh: Return a proper BOSH error response instead of deprecated(?) status...Kim Alvefur2016-04-191-2/+6
| * | mod_bosh: Log error returned from stream:feed()Kim Alvefur2016-04-191-2/+3