aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-05-223-0/+4
|\
| * Merge 0.9->0.10Kim Alvefur2016-05-221-0/+1
| |\
| | * mod_presence: Re-probe for contacts presence after outgoing 'subscribed' ↵Kim Alvefur2016-05-211-0/+1
| | | | | | | | | | | | (fixes #673)
| * | util.datamanager: Import tostring and type (fix global access)Kim Alvefur2016-05-221-0/+2
| | |
| * | util.sql: Import type too (fix global access)Kim Alvefur2016-05-221-0/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2016-05-221-1/+1
|\| |
| * | util.sql: Import pcall (fixes #677)Matthew Wild2016-05-221-1/+1
| | |
* | | MUC: Send participant list and subject on explicit joins (thanks daurnimator)Kim Alvefur2016-05-151-2/+2
| | |
* | | Backed out changeset 63141a85beea, broke multi-session nicksKim Alvefur2016-05-141-8/+3
| | |
* | | 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
| | | | | | | | | | | | in buffer after reading (fixes #583 for real)
| * | 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 ↵Kim Alvefur2016-04-301-3/+3
| | | | | | | | | | | | cbb05b454c13)
* | | 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 ↵Kim Alvefur2016-04-281-0/+12
| | | | | | | | | | | | eviction and restore
* | | 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
| | | | | | | | | | | | (so timer does not unlock an evicted room)
* | | 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 ↵Kim Alvefur2016-04-271-2/+2
| | | | | | | | | | | | jid has joined as multiple participants
* | | 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 ↵Kim Alvefur2016-04-1911-11/+11
| | | | | | | | | | | | on each start
* | | 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 ↵Kim Alvefur2016-04-191-1/+1
| | | | | | | | | | | | 100% cpu usage introduced in 65abd9d7bf88)
* | | MUC: Fix logic for when to broadcast unavailable presence (actual fix for ↵Kim Alvefur2016-04-191-2/+1
| | | | | | | | | | | | 14170d161b39)
* | | MUC: Return item-not-found as error when attempting to change role of ↵Kim Alvefur2016-04-191-1/+1
| | | | | | | | | | | | non-existant occupant
* | | 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
| |\|