aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MUC: Move history to room._historyKim Alvefur2016-04-122-6/+3
|
* Merge 0.10->trunkKim Alvefur2016-04-081-2/+3
|\
| * mod_presence: Fix variable nameKim Alvefur2016-04-081-1/+1
| |
| * mod_presence: Construct a 'from' JID when roster items are removed outside ↵Kim Alvefur2016-04-081-2/+3
| | | | | | | | of a session
* | MUC: Include originating session and stanza in eventsKim Alvefur2016-04-081-0/+4
| |
* | MUC: Spread event tables over multiple linesKim Alvefur2016-04-081-3/+18
| |
* | Merge 0.10->trunkKim Alvefur2016-04-071-2/+2
|\|
| * moduleapi: Allow an origin session to be passed to module:send()Kim Alvefur2016-04-061-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-04-062-2/+4
|\|
| * mod_websocket: Fix read timeout handler (thanks mt)Kim Alvefur2016-04-061-1/+4
| |
| * server_event: addclient: wrapclient already calls startconnection for us ↵daurnimator2013-12-181-2/+1
| | | | | | | | [backported from trunk]
* | Merge 0.10->trunkKim Alvefur2016-04-051-17/+22
|\|
| * server_event: Split long list of assignments into multiple lines for readabilityKim Alvefur2016-04-051-4/+7
| |
| * server_event: Fix indentation (again)Kim Alvefur2016-04-051-526/+527
| |
* | Merge 0.10->trunkKim Alvefur2016-04-052-12/+35
|\|
| * mod_roster: Fire event for pending items for good measureKim Alvefur2016-04-041-0/+6
| |
| * mod_roster: Handle roster item removal with event on user deletionKim Alvefur2016-04-041-6/+4
| |
| * mod_presence: Send unavailable presence when roster items are removed (fixes ↵Kim Alvefur2016-04-041-0/+1
| | | | | | | | #331)
| * mod_presence, mod_roster: Move responsibility for sending presence on roster ↵Kim Alvefur2016-04-042-7/+25
| | | | | | | | removal to mod_presence
* | Merge 0.10->trunkKim Alvefur2016-04-031-0/+3
|\|
| * Merge 0.9->0.10Kim Alvefur2016-04-031-0/+3
| |\
| | * mod_c2s: Just destroy the session when it has no connection (see #641)Kim Alvefur2016-04-031-0/+3
| | |
* | | Merge 0.10->trunkKim Alvefur2016-04-022-1/+2
|\| |
| * | mod_bosh: Skip sending stanzas removed out by filters (fixes #657)Kim Alvefur2016-04-011-0/+1
| | |
| * | storagemanager: Capitalize log messageKim Alvefur2016-04-011-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-03-292-2/+3
|\| |
| * | net.server_select: Remove do-nothing os_difftime calls [backported from trunk]daurnimator2015-01-191-5/+3
| | |
| * | net.dns: Import unpack() in forward-compatible way (Fixes compat with Lua5.2+)Kim Alvefur2016-03-281-2/+2
| | |
| * | util.jid: Import select() into local (fixes traceback, tests on Lua 5.2)Kim Alvefur2016-03-281-0/+1
| | |
* | | Merge 0.10->trunkMatthew Wild2016-03-261-1/+1
|\| |
| * | certmanager: Explicitly tonumber() version number segments before doing ↵Matthew Wild2016-03-261-1/+1
| | | | | | | | | | | | arithmetic and avoid relying on implicit coercion (thanks David Favro)
* | | Merge 0.10->trunkKim Alvefur2016-03-261-1/+5
|\| |
| * | util.sql: Log errors in transaction to error level with traceback but return ↵Kim Alvefur2016-03-251-1/+5
| | | | | | | | | | | | only error message (fixes #464)
* | | Merge 0.10->trunkKim Alvefur2016-03-241-2/+8
|\| |
| * | mod_websocket: Send a ping on read timeoutKim Alvefur2016-03-231-0/+7
| | |
| * | mod_websocket: Remove warning about unsolicited pong frames "MAY be sent ↵Kim Alvefur2016-03-231-2/+1
| | | | | | | | | | | | unsolicited" per RFC 6455 (thanks mt)
* | | Merge 0.10->trunkMatthew Wild2016-03-232-3/+7
|\| |
| * | util.sql: Charset should be innocent until proven guilty (initialize ↵Matthew Wild2016-03-231-1/+1
| | | | | | | | | | | | charset_ok to true), fixes bug introduced in 187ba2e9c012
| * | prosodyctl: Only use host part of JIDs eg components that have node parts ↵Kim Alvefur2016-03-221-2/+6
| | | | | | | | | | | | (thanks suzyo)
* | | Merge 0.10->trunkMatthew Wild2016-03-211-2/+2
|\| |
| * | util.iterators: Fix use of incorrect variable accidentally introduced in ↵Matthew Wild2016-03-211-2/+2
| | | | | | | | | | | | a9ef93bc81d9
* | | Merge 0.10->trunkKim Alvefur2016-03-212-6/+5
|\| |
| * | util.sql: Catch errors from LuaDBI connect (Fixes #568)Kim Alvefur2016-03-211-1/+2
| | |
| * | mod_storage_sql: Make sure all serialization errors are propagatedKim Alvefur2016-03-211-5/+3
| | |
* | | CHANGES: Move async to trunk, it was dropped from 0.10Kim Alvefur2016-03-211-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-03-191-1/+3
|\| |
| * | modulemanager: Silence log message about attempts to load already loaded ↵Kim Alvefur2016-03-191-1/+3
| | | | | | | | | | | | modules for shared modules
* | | Merge 0.10->trunkMatthew Wild2016-03-186-13/+98
|\| |
| * | mod_component: Some cleanup [luacheck]Matthew Wild2016-03-181-4/+3
| | |
| * | mod_component: Fire event when component disconnectsMatthew Wild2016-03-181-0/+1
| | |