aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\|
| | * mod_watchregistrations: Return the pointer to the root of the stanza, fixes ↵Emmanuel Gil Peyrot2017-05-271-1/+2
| | | | | | | | | | | | #922.
| | * net.dns: Simplify expiry calculation (fixes #919)Kim Alvefur2017-05-221-8/+2
| | |
* | | configmanager: Remove support for multiple parsers, fixes #852.Emmanuel Gil Peyrot2017-05-273-27/+8
| | |
* | | Merge 0.10->trunkKim Alvefur2017-05-201-1/+1
|\| |
| * | mod_mam: Attach stanza-id to original stanza (fixes #917)Kim Alvefur2017-05-201-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2017-05-181-1/+1
|\| |
| * | rostermanager: Use correct variable (missed one place while renaming ↵Kim Alvefur2017-05-181-1/+1
| | | | | | | | | | | | variable in b98006bfd97a)
* | | Merge 0.10->trunkKim Alvefur2017-05-178-14/+25
|\| |
| * | mod_websocket: Convert set to string (syslog sink needs a better fix)Kim Alvefur2017-05-161-1/+1
| | |
| * | prosodyctl: Show description of each certificate subcommandKim Alvefur2017-05-161-0/+4
| | |
| * | mod_storage_internal: Handle case of empty item store when deleting (fixes #910)Kim Alvefur2017-05-141-1/+7
| | |
| * | mod_storage_internal: Correctly calculate number of deleted items (fixes #912)Kim Alvefur2017-05-141-1/+2
| | |
| * | mod_message: Include username in event for offline messagesKim Alvefur2017-05-101-0/+1
| | |
| * | mod_mam: Format timestamps in log messageKim Alvefur2017-05-071-1/+3
| | |
| * | mod_message: Normalize indentationKim Alvefur2017-05-071-2/+2
| | |
| * | mod_storage_sql: Fix logic error introduced by variable rename in ↵Matthew Wild2017-04-301-1/+1
| | | | | | | | | | | | aa9f198cb3c9 (thanks waqas)
| * | mod_mam: Use correct variableKim Alvefur2017-04-271-1/+1
| | |
| * | mod_message: Remove TODO about privacy list (mod_privacy was removed)Kim Alvefur2017-04-271-2/+0
| | |
| * | mod_motd: Use initial presence event (saves some checking)Kim Alvefur2017-04-271-3/+2
| | |
| * | mod_component: Use typed config APIKim Alvefur2017-04-261-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2017-04-263-2/+17
|\| |
| * | mod_mam: Don't ask the storage backend to count all items when expiry is ↵Kim Alvefur2017-04-261-1/+7
| | | | | | | | | | | | disabled