Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2017-03-02 | 2 | -4/+19 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2017-03-02 | 1 | -2/+13 |
| |\ | |||||
| | * | mod_saslauth: Log SASL failure reason | Kim Alvefur | 2017-03-02 | 1 | -2/+13 |
| | | | |||||
| * | | mod_websocket: Make open_stream method behave like the one from util.xmppstream | Kim Alvefur | 2017-03-02 | 1 | -2/+5 |
| | | | |||||
| * | | mod_websocket: Include xml:lang attribute on stream <open> (fixes #840) | Kim Alvefur | 2017-03-02 | 1 | -0/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-03-01 | 4 | -2/+15 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2017-02-25 | 1 | -1/+4 |
| |\| | |||||
| | * | mod_register: Require encryption before registration if ↵ | Kim Alvefur | 2017-02-21 | 1 | -1/+4 |
| | | | | | | | | | | | | c2s_require_encryption is set (fixes #595) | ||||
| * | | mod_websocket: Set connections starttls method to false to prevent mod_tls ↵ | Kim Alvefur | 2017-02-25 | 1 | -0/+2 |
| | | | | | | | | | | | | from offering starttls (fixes #837) | ||||
| * | | mod_tls: Suppress debug message if already using encryption | Kim Alvefur | 2017-02-25 | 1 | -1/+3 |
| | | | |||||
| * | | mod_admin_telnet: Print a message to open sessions when shutting down, ↵ | Kim Alvefur | 2017-02-21 | 1 | -0/+6 |
| | | | | | | | | | | | | including the reason | ||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-02-20 | 3 | -8/+22 |
|\| | | |||||
| * | | mod_mam: Fix to treat first return value from archive:append as assigned ID | Kim Alvefur | 2017-02-20 | 1 | -1/+2 |
| | | | |||||
| * | | mod_storage_sql: Make archive:append() to return the id (or key) as first ↵ | Kim Alvefur | 2017-02-20 | 1 | -1/+3 |
| | | | | | | | | | | | | return value | ||||
| * | | mod_mam: Remove repeated blank line | Kim Alvefur | 2017-02-20 | 1 | -2/+0 |
| | | | |||||
| * | | mod_mam: Fix typo in comment | Kim Alvefur | 2017-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | mod_mam: Add missing wrapping <query> element when returning the query form | Kim Alvefur | 2017-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | mod_mam: Update namespace to XEP-0313 v0.6 | Kim Alvefur | 2017-02-20 | 2 | -2/+2 |
| | | | |||||
| * | | mod_mam: Strip stanza-id tags after carbons | Kim Alvefur | 2017-02-19 | 1 | -0/+13 |
| | | | |||||
| * | | mod_mam: Fix wording of comment | Kim Alvefur | 2017-02-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-02-15 | 2 | -4/+15 |
|\| | | |||||
| * | | mod_saslauth: Ignore shadowing of logger [luacheck] | Kim Alvefur | 2017-02-15 | 1 | -1/+1 |
| | | | |||||
| * | | mod_tls: Log reasons for not being able to do TLS | Kim Alvefur | 2017-02-15 | 1 | -0/+2 |
| | | | |||||
| * | | mod_saslauth: Improve logging as to why when SASL is not offered | Kim Alvefur | 2017-02-15 | 1 | -3/+11 |
| | | | |||||
| * | | mod_saslauth: Cache logger in local for less typing | Kim Alvefur | 2017-02-15 | 1 | -1/+2 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-02-14 | 1 | -2/+4 |
|\| | | |||||
| * | | mod_mam: Advertise Stanza ID support (XEP-0359) (thanks iNPUTmice) | Kim Alvefur | 2017-02-14 | 1 | -0/+1 |
| | | | |||||
| * | | mod_mam: Move stanza ID namespace to a common variable | Kim Alvefur | 2017-02-14 | 1 | -2/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-02-10 | 1 | -0/+18 |
|\| | | |||||
| * | | mod_component: Add read timeout handler (same behaviour as c2s and s2s) | Kim Alvefur | 2017-02-10 | 1 | -0/+18 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-02-04 | 2 | -2/+3 |
|\| | | |||||
| * | | mod_mam: Ignore "indirectly mutating read-only global variable prosody" ↵ | Kim Alvefur | 2017-02-04 | 1 | -0/+1 |
| | | | | | | | | | | | | warning [luacheck] | ||||
| * | | mod_mam/mamprefs: Use 'prosody.hosts' instead of '_G.hosts' in case we ever ↵ | Kim Alvefur | 2017-02-04 | 1 | -1/+1 |
| | | | | | | | | | | | | deprecate the later | ||||
| * | | mod_mam: Correct import of util.rsm | Kim Alvefur | 2017-02-04 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2017-01-28 | 2 | -15/+22 |
|\| | | |||||
| * | | mod_component: Trim trailing whitespace | Kim Alvefur | 2017-01-28 | 1 | -15/+15 |
| | | | |||||
| * | | mod_pep: Add some additional debug logging | Kim Alvefur | 2017-01-28 | 1 | -0/+7 |
| | | | |||||
* | | | 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) |