Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| | * | mod_http_files: Fix traceback when serving a non-wildcard path (fixes #611) | Kim Alvefur | 2016-03-03 | 1 | -2/+4 |
| | | | |||||
| * | | mod_welcome: Pass default text to config API as default value | Kim Alvefur | 2016-03-02 | 1 | -1/+1 |
| | | | |||||
| * | | mod_welcome: Use type-specific config API | Kim Alvefur | 2016-03-02 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-03-02 | 2 | -7/+9 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2016-03-02 | 2 | -525/+527 |
| |\| | |||||
| | * | net.server_event: Return true from conn:resume() to indicate success | Kim Alvefur | 2016-03-02 | 1 | -0/+1 |
| | | | |||||
| | * | net.server_event: Prevent resuming connections without readcallback, eg ↵ | Kim Alvefur | 2016-03-02 | 1 | -1/+1 |
| | | | | | | | | | | | | closed connections (fixes #590) | ||||
| | * | mod_c2s: Remove connection object from session object when connection ↵ | Kim Alvefur | 2016-03-02 | 1 | -0/+1 |
| | | | | | | | | | | | | disconnected to prevent accidental use (see #590) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-02-28 | 1 | -2/+2 |
|\| | | |||||
| * | | util.sasl.scram: Rename variable in places missed in 65e36b81d56a (thanks mt) | Kim Alvefur | 2016-02-28 | 1 | -2/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-02-28 | 2 | -8/+6 |
|\| | | |||||
| * | | util.sasl.scram: Remove unused initial value [luacheck] | Kim Alvefur | 2016-02-28 | 1 | -1/+1 |
| | | | |||||
| * | | util.sasl.scram: Rename variable to avoid name clash [luacheck] | Kim Alvefur | 2016-02-28 | 1 | -5/+5 |
| | | | |||||
| * | | util.sasl.anonymous: Remove unused locals [luacheck] | Kim Alvefur | 2016-02-28 | 1 | -2/+0 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-02-28 | 1 | -2/+2 |
|\| | | |||||
| * | | prosodyctl: One month is 31 days, no 13 (thanks av6) | Kim Alvefur | 2016-02-28 | 1 | -1/+1 |
| | | | |||||
| * | | prosodyctl: Fix typo (thanks av6) | Kim Alvefur | 2016-02-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-02-28 | 1 | -9/+16 |
|\| | | |||||
| * | | prosodyctl: check certs: Warn about certificate expiry in the near future | Kim Alvefur | 2016-02-28 | 1 | -0/+7 |
| | | | |||||
| * | | prosodyctl: check certs: Update messages to account for 'ssl' option maybe ↵ | Kim Alvefur | 2016-02-28 | 1 | -2/+2 |
| | | | | | | | | | | | | not existing | ||||
| * | | prosodyctl: check certs: Use certmanager to get the final ssl config in ↵ | Kim Alvefur | 2016-02-28 | 1 | -7/+7 |
| | | | | | | | | | | | | order to support the new certificate(s) config option | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-02-28 | 3 | -19/+66 |
|\| | | |||||
| * | | util.termcolours: Rename loop variable [luacheck] | Kim Alvefur | 2016-02-28 | 1 | -4/+4 |
| | | | |||||
| * | | util.termcolours: Validate color codes, fixes traceback | Kim Alvefur | 2016-02-28 | 1 | -2/+7 |
| | | | |||||
| * | | util.termcolours: Add some CSS color names | Kim Alvefur | 2016-02-27 | 1 | -0/+12 |
| | | | |||||
| * | | util.termcolours: Add 256 color support | Kim Alvefur | 2016-02-27 | 1 | -0/+25 |
| | | | |||||
| * | | util.datamanager: Explicit handling of each error condition (see #632) | Kim Alvefur | 2016-02-27 | 1 | -14/+16 |
| | | |