aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-02-048-28/+28
|\
| * mod_mam: Ignore "indirectly mutating read-only global variable prosody" ↵Kim Alvefur2017-02-041-0/+1
| | | | | | | | warning [luacheck]
| * mod_mam/mamprefs: Use 'prosody.hosts' instead of '_G.hosts' in case we ever ↵Kim Alvefur2017-02-041-1/+1
| | | | | | | | deprecate the later
| * mod_mam: Correct import of util.rsmKim Alvefur2017-02-041-1/+1
| |
| * tools/migration/migrator/*: Remove use of module()Kim Alvefur2017-02-024-15/+22
| |
| * migrator: Remove wrapper around envloadfile since envloadfile does the right ↵Kim Alvefur2017-02-021-10/+1
| | | | | | | | thing in a compatible way
| * Makefile: Install mod_mam (fixes #825)Kim Alvefur2017-01-311-1/+2
| |
* | Merge 0.10->trunkKim Alvefur2017-01-292-30/+33
|\|
| * prosody: Silence warnings about setting the globals 'server' and 'socket' ↵Kim Alvefur2017-01-291-0/+1
| | | | | | | | [luacheck]
| * prosody: Trim trailing whitespaceKim Alvefur2017-01-291-19/+19
| |
| * util.dependencies: Normalize whitespaceKim Alvefur2017-01-281-11/+13
| |
* | Merge 0.10->trunkKim Alvefur2017-01-283-15/+25
|\|
| * mod_component: Trim trailing whitespaceKim Alvefur2017-01-281-15/+15
| |
| * luacheckrc: Allow mutating the global prosody and hosts tables in core/ ↵Kim Alvefur2017-01-281-0/+3
| | | | | | | | (luacheck 0.18 adds detection of indirect mutation)
| * mod_pep: Add some additional debug loggingKim Alvefur2017-01-281-0/+7
| |
* | Merge 0.10->trunkKim Alvefur2017-01-271-3/+3
|\|
| * mod_tls: Check that connection has starttls method first to prevent offering ↵Kim Alvefur2017-01-271-3/+3
| | | | | | | | starttls over tls (thanks Remko and Tobias)
* | Merge 0.10->trunkKim Alvefur2017-01-265-18/+12
|\|
| * util.sslconfig: Remvoe flag merging for 'verify' as this is more of a ↵Kim Alvefur2017-01-262-7/+1
| | | | | | | | tri-state field than a set of options
| * mod_c2s, mod_s2s: Remove comment that no longer applies since 946871f6e3c8Kim Alvefur2017-01-252-4/+0
| |
| * mod_s2s: Clarify that it is stream features that can't be offered (here too)Kim Alvefur2017-01-251-2/+2
| |
| * mod_tls: Return session.ssl_ctx if not nil, like when doing the full session ↵Kim Alvefur2017-01-251-3/+3
| | | | | | | | type check
| * mod_tls: Add debug logging for when TLS should be doable but no ssl context ↵Kim Alvefur2017-01-251-0/+4
| | | | | | | | was set
| * mod_c2s: Clarify that there were no *stream* features to offerKim Alvefur2017-01-251-2/+2
| |
* | Merge 0.10->trunkKim Alvefur2017-01-241-1/+2
|\|
| * mod_watchregistrations: add a "registration_from" optionmathieui2017-01-241-1/+2
| | | | | | | | | | This option, if set, makes all registration notifications come from a single JID, regardless of which virtualhost it comes from.
* | Merge 0.10->trunkKim Alvefur2017-01-241-2/+2
|\|
| * mod_storage_sql: Fix to use correct order for return values from transaction ↵Kim Alvefur2017-01-241-2/+2
| | | | | | | | (thanks postblue)
* | Merge 0.10->trunkKim Alvefur2017-01-2314-108/+706
|\|
| * mod_mam: Use correct local name for util.jid.prepped_splitKim Alvefur2017-01-231-1/+1
| |
| * mod_mam: Silence warning about unused table used to describe data format ↵Kim Alvefur2017-01-231-0/+1
| | | | | | | | [luacheck]
| * mod_mam: Remove unused variables [luacheck]Kim Alvefur2017-01-231-1/+0
| |
| * CHANGES: Add mod_mamKim Alvefur2017-01-231-0/+1
| |
| * util.rsm: Add copyright headerKim Alvefur2017-01-231-0/+11
| |
| * mod_mam: Normalize copyright headersKim Alvefur2017-01-234-6/+32
| |
| * mod_mam: Change store name to "archive" but make it configurable for people ↵Kim Alvefur2017-01-112-2/+3
| | | | | | | | who have data in "archive2"
| * mod_mam: Allow a set of namespaces to be stripped from stored stanzas, ↵Kim Alvefur2016-12-191-0/+15
| | | | | | | | default to chat states (fixes #763)
| * mod_mam: If archive:delete() gives a number, this should be the number of ↵Kim Alvefur2016-11-221-5/+2
| | | | | | | | deleted items
| * mod_storage_sql: Return number of affected items from archive:deleteKim Alvefur2016-11-221-1/+2
| |
| * mod_mam: Add XEP-0359 tagKim Alvefur2016-11-191-0/+1
| |
| * mod_mam: Filter out spoofed XEP-0359 tagsKim Alvefur2016-11-191-0/+12
| |
| * mod_mam: Find out which party is the user and which is the 'with' earlierKim Alvefur2016-11-191-5/+5
| |
| * mod_mam: Alter hints processingKim Alvefur2016-11-191-6/+6
| |
| * mod_mam: Add some comments explaining archive expiryKim Alvefur2016-11-191-0/+7
| |
| * mod_mam: Remove legacy feature advertisingKim Alvefur2016-11-181-2/+0
| |
| * mod_mam: Decrease priority to zeroKim Alvefur2016-11-181-4/+4
| |
| * mod_mam: Update to XEP-0313 v0.5.1Kim Alvefur2016-11-042-4/+3
| |
| * mod_mam: Use is_stanza from util.stanzaKim Alvefur2016-11-281-5/+1
| |
| * util.rsm: Move out from mod_mam directoryKim Alvefur2016-11-262-1/+1
| |
| * mod_mam: Import from prosody-modulesKim Alvefur2016-11-045-0/+608
| |