aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2016-12-192-3/+3
|\
| * Makefile: Add 'test' to phony targets so `make test` runs tests even if a ↵Kim Alvefur2016-12-191-1/+1
| | | | | | | | file 'test' exists
| * util.pposix: rfork() seems to be FreeBSD only (fixes #412)Kim Alvefur2016-12-191-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-12-151-1/+1
|\|
| * mod_disco: Update to account for new intermediate session type (from ↵Kim Alvefur2016-12-151-1/+1
| | | | | | | | 9f70d35a1602)
* | Merge 0.10->trunkKim Alvefur2016-12-144-16/+7
|\|
| * core.stanza_router: Remove hack for allowing resource binding IQ before ↵Kim Alvefur2016-12-131-10/+0
| | | | | | | | resource binding
| * core.sessionmanager, mod_saslauth: Introduce intermediate session type for ↵Kim Alvefur2016-12-132-2/+5
| | | | | | | | authenticated but unbound sessions so that resource binding is not treated as a normal stanza
| * mod_roster: Rename variable to silence shadowing warning [luacheck]Kim Alvefur2016-12-131-2/+2
| |
| * mod_roster: Remove unused variable [luacheck]Kim Alvefur2016-12-131-1/+0
| |
| * mod_roster: Remove unused import [luacheck]Kim Alvefur2016-12-131-1/+0
| |
* | Merge 0.10->trunkKim Alvefur2016-12-105-33/+51
|\|
| * Merge 0.9->0.10Kim Alvefur2016-12-092-1/+16
| |\
| | * mod_presence: Send probe once subscribed (fixes #794)Kim Alvefur2016-12-081-1/+3
| | |
| | * core.rostermanager: Add method for checking if the user is subscribed to a ↵Kim Alvefur2016-12-091-0/+12
| | | | | | | | | | | | contact
| | * util.dependencies: Set ssl.x509 so core.certmanager knows that LuaSec is ↵0.9.12Kim Alvefur2016-11-281-0/+1
| | | | | | | | | | | | capable of certificate validation (fixes #781)
| * | mod_carbons: Rename some variables for clarityKim Alvefur2016-12-081-4/+6
| | |
| * | mod_blocklist: Check first level cache before calling blocklist getterKim Alvefur2016-12-051-6/+3
| | |
| * | mod_blocklist: Simplify loop with ipairsKim Alvefur2016-12-081-4/+2
| | |
| * | mod_blocklist: Remove one indentation levelKim Alvefur2016-12-051-12/+10
| | |
| * | mod_blocklist: Return early from migration if no valid privacy list data is ↵Kim Alvefur2016-12-051-7/+9
| | | | | | | | | | | | found
| * | mod_blocklist: Make the 'false' metadata field a table so we can store ↵Kim Alvefur2016-12-081-4/+9
| | | | | | | | | | | | timestamps and other useful data
| * | hgignore: Ignore luacheck cache fileKim Alvefur2016-12-071-0/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-12-051-2/+13
|\| |
| * | util.dependencies: Add check and info about lua-bitops (for mod_websockets)Kim Alvefur2016-12-051-0/+11
| | |
| * | util.dependencies: Update links for LuaExpat and LuaSec which have moved to ↵Kim Alvefur2016-12-051-2/+2
| | | | | | | | | | | | new locations
* | | Merge 0.10->trunkKim Alvefur2016-12-052-16/+38
|\| |
| * | mod_websocket: Allow per-host cross_domain_websocket, defaulting to the base ↵Kim Alvefur2016-12-051-2/+6
| | | | | | | | | | | | URL of the current host
| * | mod_websocket: Add the base URL of each host module is enabled on to ↵Kim Alvefur2016-12-051-0/+13
| | | | | | | | | | | | 'cross_domain_websocket'
| * | mod_websocket: Verify that the client-sent Origin header matches ↵Kim Alvefur2016-12-051-9/+13
| | | | | | | | | | | | cross_domain_websocket (fixes #652)
| * | mod_websocket: Use contains_token from util.http for checking if the ↵Kim Alvefur2016-12-041-4/+2
| | | | | | | | | | | | requested WebSocket sub-protocols include XMPP
| * | mod_websocket: Add some debug messagesKim Alvefur2016-12-041-0/+3
| | |
| * | net.websocket: Ignore unused argument warnings [luacheck]Kim Alvefur2016-12-041-3/+3
| | |
* | | Merge 0.10->trunkKim Alvefur2016-12-024-20/+36
|\| |
| * | mod_storage_sql: Normalize parameters for upgrade commandKim Alvefur2016-12-011-1/+1
| | |
| * | mod_storage_sql: List available commands if no commands given (currenly only ↵Kim Alvefur2016-12-011-1/+2
| | | | | | | | | | | | one available)
| * | mod_storage_sql: Don't say 'Unknown command' if no command was given (fixes ↵Kim Alvefur2016-12-011-0/+2
| | | | | | | | | | | | attempt to concatenate nil)
| * | mod_register: Record the time of registration in the account details storeKim Alvefur2016-12-011-0/+1
| | |
| * | mod_storage_sql: Include missing parameter table key 'port'Kim Alvefur2016-12-011-1/+1
| | |
| * | mod_storage_sql: Create a new table to hold normalized database parameters ↵Kim Alvefur2016-11-291-7/+15
| | | | | | | | | | | | (fixes #636)
| * | mod_storage_sql: Use is_stanza() from util.stanzaKim Alvefur2016-11-281-3/+1
| | |
| * | util.stanza: Add an is_stanza() function to check if an object is a stanzaKim Alvefur2016-11-281-0/+6
| | |
| * | configure: Fix quote on the correct side of the equals signKim Alvefur2016-11-281-1/+1
| | |
| * | configure: Use $() and quotes instead of `` [shellcheck]Kim Alvefur2016-11-271-8/+8
| | |
* | | Merge 0.10->trunkKim Alvefur2016-11-270-0/+0
|\| |
| * | MUC: Don't create room in response to unavailable presenceKim Alvefur2016-11-271-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2016-11-265-3/+103
|\| |
| * | doc: Add a description of the Storage API in TypedLua formatKim Alvefur2016-11-261-0/+61
| | |
| * | core.certmanager: Translate "no start line" to something friendlier (thanks ↵Kim Alvefur2016-11-261-0/+5
| | | | | | | | | | | | santiago)
| * | man/prosodyctl: Mention --configKim Alvefur2016-11-251-0/+3
| | |