aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge 0.10->trunkKim Alvefur2016-03-144-26/+37
|\| |
| * | mod_s2s: Include name of remote server when it's missing the stream ID (thank...Kim Alvefur2016-03-141-1/+1
| * | 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 its...Kim Alvefur2016-03-131-6/+10
| * | rostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set the...Kim Alvefur2016-03-121-1/+0
* | | 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 'registration_notifi...Kim Alvefur2016-03-111-1/+1
| * | 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 'ignore_presence_prior...Kim Alvefur2016-03-111-1/+1
| * | util.dependencies: Show the full error when a symbol is not found (i.e., when...Thijs Alkemade2016-03-101-2/+2
* | | 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, util.rfc6724...Matthew Wild2016-03-105-5/+1
| * | 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 origina...Matthew Wild2016-03-101-1/+1
* | | Merge 0.10->trunkMatthew Wild2016-03-092-21/+135
|\| |
| * | tests: Expand util.stanza testsMatthew Wild2016-03-091-0/+115
| * | util.stanza: Some code cleanup [luacheck]Matthew Wild2016-03-091-21/+20
| * | prosodyctl: Fix typo'd variable name [luacheck]Matthew Wild2016-03-081-1/+1
* | | prosodyctl: Fix variable typo [luacheck]Matthew Wild2016-03-091-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-03-071-1/+4
|\| |
| * | prosodyctl: Use already sorted array of module names [luacheck]Kim Alvefur2016-03-071-1/+1
| * | prosodyctl: Include libevent version in "about" output if luaevent is availableKim Alvefur2016-03-071-0/+3
* | | MergeMatthew Wild2016-03-071-1/+3
|\ \ \
| * | | MUC: Don't reply to error stanzas with more error stanzas (thanks woffs)Kim Alvefur2016-03-071-1/+3
* | | | plugins/mod_http: Keep query string over automatic redirectsdaurnimator2016-02-151-0/+3
|/ / /
* | | Merge trunk->0.10Kim Alvefur2016-03-061-7/+5
|\| |
| * | storagemanager: Fix saving data in map shim when no prior data existsKim Alvefur2016-03-061-7/+5
* | | tests: Add namespace/prefix tracking test for util.xmlMatthew Wild2016-03-051-0/+1
* | | Merge 0.10->trunkMatthew Wild2016-03-053-0/+97
|\| |
| * | tests: Add basic tests for util.xml and util.xmppstreamMatthew Wild2016-03-053-0/+97
* | | util.xmppstream: Remove namespace tracking, it's broken as implementedMatthew Wild2016-03-051-23/+0
* | | util.xml: Correct stanza.namespaces table construction when duplicate prefix ...Waqas Hussain2016-03-051-5/+11
* | | Merge 0.10->trunkMatthew Wild2016-03-0538-0/+140
|\| |
| * | tests: Add extra tests for util.jsonMatthew Wild2016-03-0538-0/+140
* | | Merge 0.10->trunkMatthew Wild2016-03-044-2/+26
|\| |
| * | util.json: Fix encoding of json.null (bug introduced in bf1f09a5bcf7)Matthew Wild2016-03-041-1/+3
| * | Makefile: Reduce verbosity of 'make test' so it only shows test failuresMatthew Wild2016-03-041-1/+1
| * | Add tests for util.jsonMatthew Wild2016-03-042-0/+22
* | | Merge 0.10->trunkKim Alvefur2016-03-032-4/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-03-031-3/+8
| |\|
| | * mod_http_files: Preserve a trailing / in paths (fixes #639)Kim Alvefur2016-03-031-0/+3
| | * mod_http_files: Don't prepend / to path twice, sanitize path does this alreadyKim Alvefur2016-03-031-1/+1