aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| | * mod_http_files: Fix traceback when serving a non-wildcard path (fixes #611)Kim Alvefur2016-03-031-2/+4
| * | mod_welcome: Pass default text to config API as default valueKim Alvefur2016-03-021-1/+1
| * | mod_welcome: Use type-specific config APIKim Alvefur2016-03-021-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-03-022-7/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2016-03-022-525/+527
| |\|
| | * net.server_event: Return true from conn:resume() to indicate successKim Alvefur2016-03-021-0/+1
| | * net.server_event: Prevent resuming connections without readcallback, eg close...Kim Alvefur2016-03-021-1/+1
| | * mod_c2s: Remove connection object from session object when connection disconn...Kim Alvefur2016-03-021-0/+1
* | | Merge 0.10->trunkKim Alvefur2016-02-281-2/+2
|\| |
| * | util.sasl.scram: Rename variable in places missed in 65e36b81d56a (thanks mt)Kim Alvefur2016-02-281-2/+2
* | | Merge 0.10->trunkKim Alvefur2016-02-282-8/+6
|\| |
| * | util.sasl.scram: Remove unused initial value [luacheck]Kim Alvefur2016-02-281-1/+1
| * | util.sasl.scram: Rename variable to avoid name clash [luacheck]Kim Alvefur2016-02-281-5/+5
| * | util.sasl.anonymous: Remove unused locals [luacheck]Kim Alvefur2016-02-281-2/+0
* | | Merge 0.10->trunkKim Alvefur2016-02-281-2/+2
|\| |
| * | prosodyctl: One month is 31 days, no 13 (thanks av6)Kim Alvefur2016-02-281-1/+1
| * | prosodyctl: Fix typo (thanks av6)Kim Alvefur2016-02-281-1/+1
* | | Merge 0.10->trunkKim Alvefur2016-02-281-9/+16
|\| |
| * | prosodyctl: check certs: Warn about certificate expiry in the near futureKim Alvefur2016-02-281-0/+7
| * | prosodyctl: check certs: Update messages to account for 'ssl' option maybe no...Kim Alvefur2016-02-281-2/+2
| * | prosodyctl: check certs: Use certmanager to get the final ssl config in order...Kim Alvefur2016-02-281-7/+7
* | | Merge 0.10->trunkKim Alvefur2016-02-283-19/+66
|\| |
| * | util.termcolours: Rename loop variable [luacheck]Kim Alvefur2016-02-281-4/+4
| * | util.termcolours: Validate color codes, fixes tracebackKim Alvefur2016-02-281-2/+7