Mercurial > prosody-modules
changeset 4154:a2d5834d4a9e
Merge
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 26 Sep 2020 14:45:08 +0200 |
| parents | 4ee2a90d3818 (diff) 87daef9ed4e7 (current diff) |
| children | b79904446d9e |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_cloud_notify/mod_cloud_notify.lua Mon Sep 21 21:57:25 2020 +0200 +++ b/mod_cloud_notify/mod_cloud_notify.lua Sat Sep 26 14:45:08 2020 +0200 @@ -257,7 +257,7 @@ local stanza_direction = "in"; local carbon; local st_type; - -- support carbon copied message stanzas having an arbitrary message-namespace or no message-namespace at all + -- support carbon copied message stanzas if not carbon then carbon = stanza:find("{urn:xmpp:carbons:2}/{urn:xmpp:forward:0}/{jabber:client}message"); end stanza_direction = carbon and stanza:child_with_name("sent") and "out" or "in"; if carbon then stanza = carbon; end
--- a/mod_conversejs/mod_conversejs.lua Mon Sep 21 21:57:25 2020 +0200 +++ b/mod_conversejs/mod_conversejs.lua Sat Sep 26 14:45:08 2020 +0200 @@ -92,6 +92,7 @@ domain_placeholder = module.host; allow_registration = allow_registration; registration_domain = allow_registration and module.host or nil; + assets_path = cdn_url..version.."/dist/"; view_mode = "fullscreen"; };
--- a/mod_easy_invite/README.markdown Mon Sep 21 21:57:25 2020 +0200 +++ b/mod_easy_invite/README.markdown Sat Sep 26 14:45:08 2020 +0200 @@ -7,8 +7,10 @@ - mod_invites --- +::: {.alert .alert-warning} **NOTE:** This module has been deprecated. Its functionality has been moved to other modules, see the mod_invites documentation for details. +::: This module allows admins and users to create invitations suitable for sharing