Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2016-03-14 | 4 | -26/+37 |
|\ | |||||
| * | mod_s2s: Include name of remote server when it's missing the stream ID ↵ | Kim Alvefur | 2016-03-14 | 1 | -1/+1 |
| | | | | | | | | (thanks Ge0rG) | ||||
| * | util.sql: Remove unused arguments [luacheck] | Kim Alvefur | 2016-03-13 | 1 | -2/+2 |
| | | |||||
| * | util.sql: Don't break out of result retreival loops | Kim Alvefur | 2016-03-13 | 1 | -7/+13 |
| | | |||||
| * | mod_storage_sql: Allow loops over results to end on their own | Kim Alvefur | 2016-03-13 | 1 | -6/+8 |
| | | |||||
| * | mod_storage_sql: Add LIMIT clause to queries where only a single row is expected | Kim Alvefur | 2016-03-13 | 1 | -3/+3 |
| | | |||||
| * | util.sql: Move per-driver (currenly only PostgreSQL) query transform into ↵ | Kim Alvefur | 2016-03-13 | 1 | -6/+10 |
| | | | | | | | | its own method | ||||
| * | rostermanager: Remove FIXME, per XMPP Core 8.1.1.1, we do not need to set ↵ | Kim Alvefur | 2016-03-12 | 1 | -1/+0 |
| | | | | | | | | the 'to' attribute | ||||
* | | MUC: Use already initialized logger | Kim Alvefur | 2016-03-11 | 1 | -1/+2 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-03-11 | 4 | -4/+5 |
|\| | |||||
| * | mod_watchregistrations: Use type-specific config API for ↵ | Kim Alvefur | 2016-03-11 | 1 | -1/+1 |
| | | | | | | | | 'registration_notification' | ||||
| * | prosodyctl check: Add 'vcard_compatibility' to deprecated options | Kim Alvefur | 2016-03-11 | 1 | -0/+1 |
| | | |||||
| * | MUC: Use type-specific config API for the 'name' option | Kim Alvefur | 2016-03-11 | 1 | -2/+1 |
| | | |||||
| * | mod_presence: Use type-specific config API for boolean ↵ | Kim Alvefur | 2016-03-11 | 1 | -1/+1 |
| | | | | | | | | 'ignore_presence_priority' option | ||||
| * | util.dependencies: Show the full error when a symbol is not found (i.e., ↵ | Thijs Alkemade | 2016-03-10 | 1 | -2/+2 |
| | | | | | | | | when running Prosody with the wrong version of Lua). | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-03-10 | 6 | -31/+27 |
|\| | |||||
| * | util.prosodyctl: Remove unused variable [luacheck] | Matthew Wild | 2016-03-10 | 1 | -1/+1 |
| | | |||||
| * | util.json: Variable renaming to avoid shadowing [luacheck] | Matthew Wild | 2016-03-10 | 1 | -14/+14 |
| | | |||||
| * | util.iterators: Variable renaming to avoid shadowing [luacheck] | Matthew Wild | 2016-03-10 | 1 | -9/+9 |
| | | |||||
| * | net.websocket.frames, util.datetime, util.json, util.prosodyctl, ↵ | Matthew Wild | 2016-03-10 | 5 | -5/+1 |
| | | | | | | | | util.rfc6724: Remove unused variables [luacheck] | ||||
| * | util.iterators: Return initial var from upstream iterator [luacheck] | Matthew Wild | 2016-03-10 | 1 | -1/+1 |
| | | |||||
| * | util.iterators: Don't replace var, as we should preserve var from the ↵ | Matthew Wild | 2016-03-10 | 1 | -1/+1 |
| | | | | | | | | original iterator [luacheck] | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-03-09 | 2 | -21/+135 |
|\| | |||||
| * | tests: Expand util.stanza tests | Matthew Wild | 2016-03-09 | 1 | -0/+115 |
| | | |||||
| * | util.stanza: Some code cleanup [luacheck] | Matthew Wild | 2016-03-09 | 1 | -21/+20 |
| | | |||||
| * | prosodyctl: Fix typo'd variable name [luacheck] | Matthew Wild | 2016-03-08 | 1 | -1/+1 |
| | | |||||
* | | prosodyctl: Fix variable typo [luacheck] | Matthew Wild | 2016-03-09 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-03-07 | 1 | -1/+4 |
|\| | |||||
| * | prosodyctl: Use already sorted array of module names [luacheck] | Kim Alvefur | 2016-03-07 | 1 | -1/+1 |
| | | |||||
| * | prosodyctl: Include libevent version in "about" output if luaevent is available | Kim Alvefur | 2016-03-07 | 1 | -0/+3 |
| | | |||||
* | | Merge | Matthew Wild | 2016-03-07 | 1 | -1/+3 |
|\ \ | |||||
| * | | MUC: Don't reply to error stanzas with more error stanzas (thanks woffs) | Kim Alvefur | 2016-03-07 | 1 | -1/+3 |
| | | | |||||
* | | | plugins/mod_http: Keep query string over automatic redirects | daurnimator | 2016-02-15 | 1 | -0/+3 |
|/ / | |||||
* | | Merge trunk->0.10 | Kim Alvefur | 2016-03-06 | 1 | -7/+5 |
|\| | |||||
| * | storagemanager: Fix saving data in map shim when no prior data exists | Kim Alvefur | 2016-03-06 | 1 | -7/+5 |
| | | |||||
* | | tests: Add namespace/prefix tracking test for util.xml | Matthew Wild | 2016-03-05 | 1 | -0/+1 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-03-05 | 3 | -0/+97 |
|\| | |||||
| * | tests: Add basic tests for util.xml and util.xmppstream | Matthew Wild | 2016-03-05 | 3 | -0/+97 |
| | | |||||
* | | util.xmppstream: Remove namespace tracking, it's broken as implemented | Matthew Wild | 2016-03-05 | 1 | -23/+0 |
| | | | | | | | | | | The code fails to handle namespaces on the initial opening tag (when 'stanza' is nil). Fixing this seems not worth the effort for a feature that is not being used. | ||||
* | | util.xml: Correct stanza.namespaces table construction when duplicate prefix ↵ | Waqas Hussain | 2016-03-05 | 1 | -5/+11 |
| | | | | | | | | names are encountered in the element tree. | ||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-03-05 | 38 | -0/+140 |
|\| | |||||
| * | tests: Add extra tests for util.json | Matthew Wild | 2016-03-05 | 38 | -0/+140 |
| | | |||||
* | | Merge 0.10->trunk | Matthew Wild | 2016-03-04 | 4 | -2/+26 |
|\| | |||||
| * | util.json: Fix encoding of json.null (bug introduced in bf1f09a5bcf7) | Matthew Wild | 2016-03-04 | 1 | -1/+3 |
| | | |||||
| * | Makefile: Reduce verbosity of 'make test' so it only shows test failures | Matthew Wild | 2016-03-04 | 1 | -1/+1 |
| | | |||||
| * | Add tests for util.json | Matthew Wild | 2016-03-04 | 2 | -0/+22 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2016-03-03 | 2 | -4/+9 |
|\| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2016-03-03 | 1 | -3/+8 |
| |\ | |||||
| | * | mod_http_files: Preserve a trailing / in paths (fixes #639) | Kim Alvefur | 2016-03-03 | 1 | -0/+3 |
| | | | |||||
| | * | mod_http_files: Don't prepend / to path twice, sanitize path does this already | Kim Alvefur | 2016-03-03 | 1 | -1/+1 |
| | | |