aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * MergeKim Alvefur2016-03-184-8/+93
| |\
| | * prosody, prosodyctl: Allow setting CFG_* variables via Lua interpreter ↵Matthew Wild2016-03-182-8/+8
| | | | | | | | | | | | before loading Prosody. Fixes #308.
| | * util.jid+tests: Add simple helpers... node(), host() and resource() for ↵Matthew Wild2016-03-172-0/+85
| | | | | | | | | | | | extracting specific parts of a JID
| * | mod_saslauth: Disable DIGEST-MD5 by default (closes #515)Kim Alvefur2016-03-181-1/+1
| |/
* | Merge 0.10->trunkKim Alvefur2016-03-182-2/+2
|\|
| * mod_websocket: Make sure stanza xmlns filter runs late in the chainKim Alvefur2016-03-181-1/+1
| |
| * mod_register: Make sure only an on_evict function or nil is passed to util.cacheKim Alvefur2016-03-171-1/+1
| |
* | Merge 0.10->trunkMatthew Wild2016-03-172-15/+96
|\|
| * tests: util.cache: Tests for different return values of on_evictMatthew Wild2016-03-171-0/+24
| |
| * util.cache: Change behaviour of on_evict (and tests). Now accepts false ↵Matthew Wild2016-03-172-14/+34
| | | | | | | | instead of a function (never evict), or on_evict can return false to prevent eviction.
| * util.cache: Add head() and tail() methods (and tests)Matthew Wild2016-03-172-1/+38
| |
* | Merge 0.10->trunkKim Alvefur2016-03-170-0/+0
|\|
| * CHANGES: Remove mention of asyncKim Alvefur2016-03-171-1/+0
| |
* | Merge 0.10->trunkKim Alvefur2016-03-170-0/+0
|\|
| * util.async: Remove to prevent blocking a stable releaseKim Alvefur2016-03-171-158/+0
| |
| * mod_c2s: Remove use of util.asyncKim Alvefur2016-03-172-21/+5
| |
| * Backed out BOSH use of util.async (changeset f0687c313cf1)Kim Alvefur2016-03-171-13/+3
| |
* | Merge 0.10->trunkKim Alvefur2016-03-141-1/+1
|\|
| * mod_presence: Fix partial renameKim Alvefur2016-03-141-1/+1
| |
* | Merge 0.10->trunkKim Alvefur2016-03-142-24/+40
|\|
| * mod_presence: Move function for selecting "top resources" into a new ↵Kim Alvefur2016-03-142-24/+40
| | | | | | | | util.presence
* | Merge 0.10->trunkKim Alvefur2016-03-144-26/+37
|\|
| * mod_s2s: Include name of remote server when it's missing the stream ID ↵Kim Alvefur2016-03-141-1/+1
| | | | | | | | (thanks Ge0rG)
| * util.sql: Remove unused arguments [luacheck]Kim Alvefur2016-03-131-2/+2
| |
| * util.sql: Don't break out of result retreival loopsKim Alvefur2016-03-131-7/+13
| |
| * mod_storage_sql: Allow loops over results to end on their ownKim Alvefur2016-03-131-6/+8
| |
| * mod_storage_sql: Add LIMIT clause to queries where only a single row is expectedKim Alvefur2016-03-131-3/+3
| |
| * util.sql: Move per-driver (currenly only PostgreSQL) query transform into ↵Kim Alvefur2016-03-131-6/+10
| | | | | | | | its own method
| * rostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set ↵Kim Alvefur2016-03-121-1/+0
| | | | | | | | the 'to' attribute
* | MUC: Use already initialized loggerKim Alvefur2016-03-111-1/+2
| |
* | Merge 0.10->trunkKim Alvefur2016-03-114-4/+5
|\|
| * mod_watchregistrations: Use type-specific config API for ↵Kim Alvefur2016-03-111-1/+1
| | | | | | | | 'registration_notification'
| * prosodyctl check: Add 'vcard_compatibility' to deprecated optionsKim Alvefur2016-03-111-0/+1
| |
| * MUC: Use type-specific config API for the 'name' optionKim Alvefur2016-03-111-2/+1
| |
| * mod_presence: Use type-specific config API for boolean ↵Kim Alvefur2016-03-111-1/+1
| | | | | | | | 'ignore_presence_priority' option
| * util.dependencies: Show the full error when a symbol is not found (i.e., ↵Thijs Alkemade2016-03-101-2/+2
| | | | | | | | when running Prosody with the wrong version of Lua).
* | Merge 0.10->trunkMatthew Wild2016-03-106-31/+27
|\|
| * util.prosodyctl: Remove unused variable [luacheck]Matthew Wild2016-03-101-1/+1
| |
| * util.json: Variable renaming to avoid shadowing [luacheck]Matthew Wild2016-03-101-14/+14
| |
| * util.iterators: Variable renaming to avoid shadowing [luacheck]Matthew Wild2016-03-101-9/+9
| |
| * net.websocket.frames, util.datetime, util.json, util.prosodyctl, ↵Matthew Wild2016-03-105-5/+1
| | | | | | | | util.rfc6724: Remove unused variables [luacheck]
| * util.iterators: Return initial var from upstream iterator [luacheck]Matthew Wild2016-03-101-1/+1
| |
| * util.iterators: Don't replace var, as we should preserve var from the ↵Matthew Wild2016-03-101-1/+1
| | | | | | | | original iterator [luacheck]
* | Merge 0.10->trunkMatthew Wild2016-03-092-21/+135
|\|