aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-08-292-2/+2
|\
| * prosody, prosodyctl: Fix traceback if ssl config is missing (thanks lookshe ↵Kim Alvefur2017-08-292-2/+2
| | | | | | | | and sol)
* | 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 ↵Kim Alvefur2017-07-072-1/+12
| | | | | | | | (part of fix for #659)
| * net.http: Move default SSL/TLS settings into options, allowing them to be ↵Kim Alvefur2017-07-071-2/+4
| | | | | | | | overriden in new()
| * 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, ↵Kim Alvefur2017-08-241-0/+2
| | | | | | | | account deletion and which is in-band registration
| * 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 ↵Kim Alvefur2017-07-286-6/+24
| | | | | | | | change (thanks waqas) (fixes #512)
| * 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 ↵Kim Alvefur2017-07-271-1/+1
| | | | | | | | in 200f1f6306a7) (fixes #957)
| * 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 ↵Kim Alvefur2017-07-061-0/+2
| | | | | | | | where
| * 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 ↵Kim Alvefur2017-07-061-1/+1
| | | | | | | | restrict_room_creation
* | MUC: Return item-not-found for eg messages to non-existant rooms (changed in ↵Kim Alvefur2017-07-061-1/+1
| | | | | | | | 566aba0482b6 for unknown reason)
* | 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
| | | | | | | | #939)
* | 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
|\| |
| * | Merge 0.9->0.10Kim Alvefur2017-06-011-2/+2
| |\|
| | * mod_welcome: Return the pointer to the root of the stanza, fixes a bug ↵Emmanuel Gil Peyrot2017-05-301-2/+2
| | | | | | | | | | | | similar to #922.
| * | certmanager: Update the 'certificates' option after the config has been ↵Kim Alvefur2017-06-011-0/+1
| | | | | | | | | | | | reloaded (fixes #929)
* | | configmanager: Remove unused local [luacheck]Kim Alvefur2017-05-281-2/+2
| | |
* | | Merge 0.10->trunkKim Alvefur2017-05-273-9/+5
|\| |
| * | Merge 0.9->0.10Kim Alvefur2017-05-271-0/+1
| |\|
| | * mod_disco: Add an account/registered identity on subscribed accounts, fixes ↵Emmanuel Gil Peyrot2017-05-271-0/+1
| | | | | | | | | | | | #826.
| * | Merge 0.9->0.10Kim Alvefur2017-05-272-9/+4
| |\|