aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2017-02-153-12/+22
|\
| * mod_saslauth: Ignore shadowing of logger [luacheck]Kim Alvefur2017-02-151-1/+1
| * mod_tls: Log reasons for not being able to do TLSKim Alvefur2017-02-151-0/+2
| * mod_saslauth: Improve logging as to why when SASL is not offeredKim Alvefur2017-02-151-3/+11
| * mod_saslauth: Cache logger in local for less typingKim Alvefur2017-02-151-1/+2
| * migrator: Fix missing wordKim Alvefur2017-02-151-1/+1
| * migrator: Fix argument parsingKim Alvefur2017-02-151-5/+4
| * migrator: Unexpand whitespaceKim Alvefur2017-02-151-2/+2
* | Merge 0.10->trunkKim Alvefur2017-02-149-141/+167
|\|
| * mod_mam: Advertise Stanza ID support (XEP-0359) (thanks iNPUTmice)Kim Alvefur2017-02-141-0/+1
| * mod_mam: Move stanza ID namespace to a common variableKim Alvefur2017-02-141-2/+3
| * util-src/*.c: Attach pointer * to name instead of typeKim Alvefur2017-02-128-138/+162
| * util.ringbuffer: Remove address of buffer itself from __tostring since is now...Kim Alvefur2017-02-121-1/+1
* | Merge 0.10->trunkKim Alvefur2017-02-101-0/+18
|\|
| * mod_component: Add read timeout handler (same behaviour as c2s and s2s)Kim Alvefur2017-02-101-0/+18
* | Merge 0.10->trunkKim Alvefur2017-02-048-28/+28
|\|
| * mod_mam: Ignore "indirectly mutating read-only global variable prosody" warni...Kim Alvefur2017-02-041-0/+1
| * mod_mam/mamprefs: Use 'prosody.hosts' instead of '_G.hosts' in case we ever d...Kim Alvefur2017-02-041-1/+1
| * 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
| * 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' [lu...Kim Alvefur2017-01-291-0/+1
| * 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/ (luac...Kim Alvefur2017-01-281-0/+3
| * 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
* | Merge 0.10->trunkKim Alvefur2017-01-265-18/+12
|\|
| * util.sslconfig: Remvoe flag merging for 'verify' as this is more of a tri-sta...Kim Alvefur2017-01-262-7/+1
| * 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
| * mod_tls: Add debug logging for when TLS should be doable but no ssl context w...Kim Alvefur2017-01-251-0/+4
| * 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
* | 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
* | 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 [lua...Kim Alvefur2017-01-231-0/+1
| * 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