Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2017-01-27 | 1 | -3/+3 |
|\ | |||||
| * | mod_tls: Check that connection has starttls method first to prevent offering ↵ | Kim Alvefur | 2017-01-27 | 1 | -3/+3 |
| | | | | | | | | starttls over tls (thanks Remko and Tobias) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-26 | 4 | -16/+12 |
|\| | |||||
| * | util.sslconfig: Remvoe flag merging for 'verify' as this is more of a ↵ | Kim Alvefur | 2017-01-26 | 1 | -5/+1 |
| | | | | | | | | tri-state field than a set of options | ||||
| * | mod_c2s, mod_s2s: Remove comment that no longer applies since 946871f6e3c8 | Kim Alvefur | 2017-01-25 | 2 | -4/+0 |
| | | |||||
| * | mod_s2s: Clarify that it is stream features that can't be offered (here too) | Kim Alvefur | 2017-01-25 | 1 | -2/+2 |
| | | |||||
| * | mod_tls: Return session.ssl_ctx if not nil, like when doing the full session ↵ | Kim Alvefur | 2017-01-25 | 1 | -3/+3 |
| | | | | | | | | type check | ||||
| * | mod_tls: Add debug logging for when TLS should be doable but no ssl context ↵ | Kim Alvefur | 2017-01-25 | 1 | -0/+4 |
| | | | | | | | | was set | ||||
| * | mod_c2s: Clarify that there were no *stream* features to offer | Kim Alvefur | 2017-01-25 | 1 | -2/+2 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-24 | 1 | -1/+2 |
|\| | |||||
| * | mod_watchregistrations: add a "registration_from" option | mathieui | 2017-01-24 | 1 | -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->trunk | Kim Alvefur | 2017-01-24 | 1 | -2/+2 |
|\| | |||||
| * | mod_storage_sql: Fix to use correct order for return values from transaction ↵ | Kim Alvefur | 2017-01-24 | 1 | -2/+2 |
| | | | | | | | | (thanks postblue) | ||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-23 | 6 | -6/+582 |
|\| | |||||
| * | mod_mam: Use correct local name for util.jid.prepped_split | Kim Alvefur | 2017-01-23 | 1 | -1/+1 |
| | | |||||
| * | mod_mam: Silence warning about unused table used to describe data format ↵ | Kim Alvefur | 2017-01-23 | 1 | -0/+1 |
| | | | | | | | | [luacheck] | ||||
| * | mod_mam: Remove unused variables [luacheck] | Kim Alvefur | 2017-01-23 | 1 | -1/+0 |
| | | |||||
| * | mod_mam: Normalize copyright headers | Kim Alvefur | 2017-01-23 | 4 | -6/+32 |
| | | |||||
| * | mod_mam: Change store name to "archive" but make it configurable for people ↵ | Kim Alvefur | 2017-01-11 | 2 | -2/+3 |
| | | | | | | | | who have data in "archive2" | ||||
| * | mod_mam: Allow a set of namespaces to be stripped from stored stanzas, ↵ | Kim Alvefur | 2016-12-19 | 1 | -0/+15 |
| | | | | | | | | default to chat states (fixes #763) | ||||
| * | mod_mam: If archive:delete() gives a number, this should be the number of ↵ | Kim Alvefur | 2016-11-22 | 1 | -5/+2 |
| | | | | | | | | deleted items | ||||
| * | mod_storage_sql: Return number of affected items from archive:delete | Kim Alvefur | 2016-11-22 | 1 | -1/+2 |
| | | |||||
| * | mod_mam: Add XEP-0359 tag | Kim Alvefur | 2016-11-19 | 1 | -0/+1 |
| | | |||||
| * | mod_mam: Filter out spoofed XEP-0359 tags | Kim Alvefur | 2016-11-19 | 1 | -0/+12 |
| | | |||||
| * | mod_mam: Find out which party is the user and which is the 'with' earlier | Kim Alvefur | 2016-11-19 | 1 | -5/+5 |
| | | |||||
| * | mod_mam: Alter hints processing | Kim Alvefur | 2016-11-19 | 1 | -6/+6 |
| | | |||||
| * | mod_mam: Add some comments explaining archive expiry | Kim Alvefur | 2016-11-19 | 1 | -0/+7 |
| | | |||||
| * | mod_mam: Remove legacy feature advertising | Kim Alvefur | 2016-11-18 | 1 | -2/+0 |
| | | |||||
| * | mod_mam: Decrease priority to zero | Kim Alvefur | 2016-11-18 | 1 | -4/+4 |
| | | |||||
| * | mod_mam: Update to XEP-0313 v0.5.1 | Kim Alvefur | 2016-11-04 | 2 | -4/+3 |
| | | |||||
| * | mod_mam: Use is_stanza from util.stanza | Kim Alvefur | 2016-11-28 | 1 | -5/+1 |
| | | |||||
| * | util.rsm: Move out from mod_mam directory | Kim Alvefur | 2016-11-26 | 2 | -88/+1 |
| | | |||||
| * | mod_mam: Import from prosody-modules | Kim Alvefur | 2016-11-04 | 5 | -0/+608 |
| | | |||||
| * | mod_tls: Verify that TLS is available before proceeding | Kim Alvefur | 2017-01-23 | 1 | -1/+1 |
| | | |||||
| * | mod_tls: Only accept <proceed> on outgoing s2s connections | Kim Alvefur | 2017-01-23 | 1 | -5/+7 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-09 | 1 | -5/+12 |
|\| | |||||
| * | mod_register: Fix syntax errors | Kim Alvefur | 2017-01-06 | 1 | -2/+1 |
| | | |||||
| * | mod_register: Verify that fields are known to prevent traceback | Kim Alvefur | 2017-01-06 | 1 | -0/+3 |
| | | |||||
| * | mod_register: Strip '+' char from field names without using length | Kim Alvefur | 2017-01-06 | 1 | -1/+1 |
| | | |||||
| * | mod_register: Allow 'title' and 'instructions' fields to be customized | Kim Alvefur | 2017-01-05 | 1 | -3/+8 |
| | | |||||
* | | Merge 0.10->trunk | Kim Alvefur | 2017-01-04 | 1 | -0/+1 |
|\| | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2017-01-04 | 1 | -0/+1 |
| |\ | |||||
| | * | mod_net_multiplex: Enable SSL on the SSL port (fixes #803) | Kim Alvefur | 2016-12-21 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-12-15 | 1 | -1/+1 |
|\| | | |||||
| * | | mod_disco: Update to account for new intermediate session type (from ↵ | Kim Alvefur | 2016-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | 9f70d35a1602) | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2016-12-14 | 2 | -5/+3 |
|\| | | |||||
| * | | core.sessionmanager, mod_saslauth: Introduce intermediate session type for ↵ | Kim Alvefur | 2016-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | authenticated but unbound sessions so that resource binding is not treated as a normal stanza | ||||
| * | | mod_roster: Rename variable to silence shadowing warning [luacheck] | Kim Alvefur | 2016-12-13 | 1 | -2/+2 |
| | | | |||||
| * | | mod_roster: Remove unused variable [luacheck] | Kim Alvefur | 2016-12-13 | 1 | -1/+0 |
| | | | |||||
| * | | mod_roster: Remove unused import [luacheck] | Kim Alvefur | 2016-12-13 | 1 | -1/+0 |
| | | |