From a0407608a88b6c58c4ba937ac1097a530f433ae8 Mon Sep 17 00:00:00 2001 From: Ashfame Date: Tue, 6 Dec 2022 10:19:17 +0400 Subject: [PATCH 1/5] changed image srcs to be https based --- synapse/res/templates/_base.html | 6 +++--- synapse/res/templates/notice_expiry.html | 6 +++--- synapse/res/templates/notif_mail.html | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/synapse/res/templates/_base.html b/synapse/res/templates/_base.html index 46439fce6aa6..4b5cc7bcb62a 100644 --- a/synapse/res/templates/_base.html +++ b/synapse/res/templates/_base.html @@ -13,13 +13,13 @@
{% if app_name == "Riot" %} - [Riot] + [Riot] {% elif app_name == "Vector" %} - [Vector] + [Vector] {% elif app_name == "Element" %} [Element] {% else %} - [matrix] + [matrix] {% endif %}
diff --git a/synapse/res/templates/notice_expiry.html b/synapse/res/templates/notice_expiry.html index 406397aaca76..f62038e111cc 100644 --- a/synapse/res/templates/notice_expiry.html +++ b/synapse/res/templates/notice_expiry.html @@ -21,13 +21,13 @@ {% if app_name == "Riot" %} - [Riot] + [Riot] {% elif app_name == "Vector" %} - [Vector] + [Vector] {% elif app_name == "Element" %} [Element] {% else %} - [matrix] + [matrix] {% endif %} diff --git a/synapse/res/templates/notif_mail.html b/synapse/res/templates/notif_mail.html index 2add9dd859ce..7da0fff5e946 100644 --- a/synapse/res/templates/notif_mail.html +++ b/synapse/res/templates/notif_mail.html @@ -22,13 +22,13 @@ {%- if app_name == "Riot" %} - [Riot] + [Riot] {%- elif app_name == "Vector" %} - [Vector] + [Vector] {%- elif app_name == "Element" %} [Element] {%- else %} - [matrix] + [matrix] {%- endif %} From 2d6383446f28c22b4777e879de66b587581cb808 Mon Sep 17 00:00:00 2001 From: Ashfame Date: Tue, 6 Dec 2022 11:04:19 +0400 Subject: [PATCH 2/5] add changelog file --- 16841.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 16841.bugfix diff --git a/16841.bugfix b/16841.bugfix new file mode 100644 index 000000000000..a4d1216690ec --- /dev/null +++ b/16841.bugfix @@ -0,0 +1 @@ +Fix html templates to load images only on HTTPS. Contributed by @ashfame. From d0f1260ddd4eb9abbcf88bb111d7c041845c72d1 Mon Sep 17 00:00:00 2001 From: Ashfame Date: Tue, 6 Dec 2022 11:16:38 +0400 Subject: [PATCH 3/5] fix changelog file name --- 16841.bugfix => 16842.bugfix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 16841.bugfix => 16842.bugfix (100%) diff --git a/16841.bugfix b/16842.bugfix similarity index 100% rename from 16841.bugfix rename to 16842.bugfix From 3921fbd51a5e124b95558aac2d63b4d2e4a6b9eb Mon Sep 17 00:00:00 2001 From: Ashfame Date: Tue, 6 Dec 2022 11:23:45 +0400 Subject: [PATCH 4/5] fix changelog file name again --- 16842.bugfix => 14625.bugfix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 16842.bugfix => 14625.bugfix (100%) diff --git a/16842.bugfix b/14625.bugfix similarity index 100% rename from 16842.bugfix rename to 14625.bugfix From 53194cb550aed4686b6389974ea997b3e6925da1 Mon Sep 17 00:00:00 2001 From: Ashfame Date: Tue, 6 Dec 2022 11:43:38 +0400 Subject: [PATCH 5/5] move changelog file to the right dir --- 14625.bugfix => changelog.d/14625.bugfix | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename 14625.bugfix => changelog.d/14625.bugfix (100%) diff --git a/14625.bugfix b/changelog.d/14625.bugfix similarity index 100% rename from 14625.bugfix rename to changelog.d/14625.bugfix