aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* util.pubsub: Add a node parameter to itemstore().Emmanuel Gil Peyrot2017-04-021-4/+4
* mod_pubsub: Fix a few warnings [luacheck]Emmanuel Gil Peyrot2017-04-142-11/+12
* tests: Add failing tests for util.asyncMatthew Wild2017-09-121-7/+160
* Merge 0.10->trunkKim Alvefur2017-09-043-26/+36
|\
| * mod_mam: Factor out <stanza-id> stripping so it can be reused in two placesKim Alvefur2017-09-031-23/+22
| * mod_mam: Clone stanza before stripping stanza id after carbonsKim Alvefur2017-09-031-0/+1
| * man/prosodyctl.markdown: ReflowKim Alvefur2017-09-021-2/+2
| * man prosodyctl: Add text about the `cert import` commandKim Alvefur2017-09-022-2/+12
* | Merge 0.10->trunkKim Alvefur2017-08-292-2/+2
|\|
| * prosody, prosodyctl: Fix traceback if ssl config is missing (thanks lookshe a...Kim Alvefur2017-08-292-2/+2
* | Merge 0.10->trunkKim Alvefur2017-08-2813-28/+103
|\|
| * net.http: Add option for disabling TLS certifictate validationKim Alvefur2017-07-071-1/+2
| * net.http: Validate HTTPS certificates (fixes #659)Kim Alvefur2017-07-071-0/+21
| * prosody, prosodyctl: Set up TLS settings for HTTPS requests in net.http (part...Kim Alvefur2017-07-072-1/+12
| * net.http: Move default SSL/TLS settings into options, allowing them to be ove...Kim Alvefur2017-07-071-2/+4
| * net.http: Expose defaultsKim Alvefur2017-07-071-0/+1
| * net.http: Remove duplicate 'request' entryKim Alvefur2017-07-071-1/+0
| * mod_register: Add comments saying which section handles password change, acco...Kim Alvefur2017-08-241-0/+2
| * mod_mam: Clone stanzas before mutating (thanks waqas) (fixes #961)Kim Alvefur2017-07-251-14/+23
| * core.usermanager, various modules: Disconnect other resources on password cha...Kim Alvefur2017-07-286-6/+24
| * MUC: Use variable that actually exists (thanks Martin)Kim Alvefur2017-08-061-2/+2
| * prosodyctl: Skip certificate checks for hosts of the form node@host (fixes #779)Kim Alvefur2017-08-041-1/+8
| * net.websocket: Remove stray module api reference, shouldn't be used in hereKim Alvefur2017-07-301-1/+1
| * mod_disco: Advertise in stream-features after auth (probably what was meant i...Kim Alvefur2017-07-271-1/+1
| * MUC: Reject whitespace-only nicknames (fixes #337)Kim Alvefur2017-07-211-0/+14
| * util.sql: Greedily read all rows so we can close queries early (fixes #391)Matthew Wild2017-08-041-1/+5
* | Merge 0.10 -> trunkMatthew Wild2017-07-283-2/+6
|\|
| * sessionmanager: Revert session.type if binding fails due to roster load errorMatthew Wild2017-07-281-0/+4
| * mod_register: Add ::1 to the default registration_whitelist.Emmanuel Gil Peyrot2017-07-161-1/+1
| * mod_bosh: Add ::1 to the default trusted_proxies.Emmanuel Gil Peyrot2017-07-161-1/+1
* | Merge 0.10->trunkKim Alvefur2017-07-065-2/+18
|\|
| * prosodyctl: Make `cert check` do the same as `check certs`Kim Alvefur2017-07-061-0/+2
| * MUC: Add some comments attempting to explain what presence and <x> tag goes w...Kim Alvefur2017-07-061-0/+2
| * MUC: Include status code 110 on affiliation changes (see #765)Kim Alvefur2017-07-061-3/+7
| * MUC: Include status code 110 on role change notifications (fixes #765))Kim Alvefur2017-07-061-3/+6
| * mod_storage_internal: Return a noop iterator if archive is empty (fixes #920)Kim Alvefur2017-07-051-1/+7
| * mod_mam: Request a total count if no items are requestedKim Alvefur2017-07-051-1/+1
| * man prosodyctl: Mention the --root flagKim Alvefur2017-07-012-0/+8
* | MUC: Include a human-readable message when denying room creation because of r...Kim Alvefur2017-07-061-1/+1
* | MUC: Return item-not-found for eg messages to non-existant rooms (changed in ...Kim Alvefur2017-07-061-1/+1
* | MUC: Log debug message when restoring a room from storageKim Alvefur2017-07-061-0/+1
* | Backed out changeset a6574fdf8734, violates XEP-0045Kim Alvefur2017-07-031-10/+3
* | MUC: Only send status code 307 to the user being kicked, not everyone (fixes ...Kim Alvefur2017-06-261-3/+10
* | Merge 0.10->trunkKim Alvefur2017-06-131-2/+3
|\|
| * mod_posix: Ignore currently unused argument [luacheck]Kim Alvefur2017-06-131-1/+1
| * mod_posix: Split long line [luacheck]Kim Alvefur2017-06-131-1/+2
* | Merge 0.10->trunkKim Alvefur2017-06-131-1/+1
|\|
| * Merge 0.9->0.10Kim Alvefur2017-06-131-1/+1
| |\
| | * net.dns: Prevent answers from immediately expiring even if TTL=0 (see #919)Kim Alvefur2017-06-131-1/+1
* | | Merge 0.10->trunkKim Alvefur2017-06-012-2/+3
|\| |