From 95d46b08b4260f1a0e189105fffb6f0471f3473d Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 28 Sep 2022 14:34:33 +0200
Subject: [PATCH 01/57] New test release v1.11.6-sc.0.test.3

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index e8138b9..cbcbe7f 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit e8138b904e656a28f0a2ad260f3ab9f5d85af401
+Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b
diff --git a/element-web b/element-web
index ed7c271..8a4c07f 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit ed7c271bc8028760639bdee69387bc58956c556b
+Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb
diff --git a/matrix-react-sdk b/matrix-react-sdk
index a8c4ff4..eb6b8d0 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit a8c4ff42459a33610b1cba4105b9cdc4f52eaa64
+Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a

From 77fbeb625cc885e229f3e2eb1b5aea11f2d0ede5 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 28 Sep 2022 19:49:26 +0200
Subject: [PATCH 02/57] New release v1.11.8-sc.1

---
 element-desktop       | 2 +-
 element-web           | 2 +-
 generate_changelog.sh | 4 ++--
 matrix-js-sdk         | 2 +-
 matrix-react-sdk      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/element-desktop b/element-desktop
index cbcbe7f..0be4f8f 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b
+Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461
diff --git a/element-web b/element-web
index 8a4c07f..ef58800 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb
+Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca
diff --git a/generate_changelog.sh b/generate_changelog.sh
index 3bca794..1e65601 100755
--- a/generate_changelog.sh
+++ b/generate_changelog.sh
@@ -16,8 +16,8 @@ forall_repos check_branch $branch
 forall_repos check_clean_git
 
 # Fetch upstream
-forall_repos git fetch origin > /dev/null
-forall_repos git fetch upstream > /dev/null
+forall_repos git fetch origin > /dev/null 2>/dev/null
+forall_repos git fetch upstream > /dev/null 2>/dev/null
 
 (
     # Add new line below git log: https://unix.stackexchange.com/a/345558
diff --git a/matrix-js-sdk b/matrix-js-sdk
index cb81a65..c2f7795 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58
+Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db
diff --git a/matrix-react-sdk b/matrix-react-sdk
index eb6b8d0..0d5ad44 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a
+Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b

From b9d35c0cc10d12f3d4af25ffba200977410f80d9 Mon Sep 17 00:00:00 2001
From: autoteelar <sropkek@gmail.com>
Date: Wed, 26 Oct 2022 10:50:41 +0200
Subject: [PATCH 03/57] Added translation using Weblate (Japanese)

---
 i18n-overlays/matrix-react-sdk/ja.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 i18n-overlays/matrix-react-sdk/ja.json

diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/i18n-overlays/matrix-react-sdk/ja.json
@@ -0,0 +1 @@
+{}

From c2318080eb5f8702006fe2560c77b9c31805bbae Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 26 Oct 2022 10:50:49 +0200
Subject: [PATCH 04/57] Added translation using Weblate (Japanese)

---
 i18n-overlays/element-web/ja.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 i18n-overlays/element-web/ja.json

diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/i18n-overlays/element-web/ja.json
@@ -0,0 +1 @@
+{}

From 92599de20a2546f94bcf6e4d7c668283e939632a Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 26 Oct 2022 10:50:50 +0200
Subject: [PATCH 05/57] Added translation using Weblate (Japanese)

---
 i18n-overlays/element-desktop/ja.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 i18n-overlays/element-desktop/ja.json

diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/i18n-overlays/element-desktop/ja.json
@@ -0,0 +1 @@
+{}

From ae1e15dcef70345d5a469d2bb62e4eee294892d4 Mon Sep 17 00:00:00 2001
From: autoteelar <sropkek@gmail.com>
Date: Wed, 26 Oct 2022 09:00:38 +0000
Subject: [PATCH 06/57] Translated using Weblate (Japanese)

Currently translated at 1.9% (1 of 51 strings)

Translation: SchildiChat/matrix-react-sdk
Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/ja/
---
 i18n-overlays/matrix-react-sdk/ja.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json
index 0967ef4..fedc533 100644
--- a/i18n-overlays/matrix-react-sdk/ja.json
+++ b/i18n-overlays/matrix-react-sdk/ja.json
@@ -1 +1,3 @@
-{}
+{
+    "Normal priority": "常優先度"
+}

From e22b6bb03124e9a0d86fa7aaab1aa59216906587 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 29 Oct 2022 23:41:13 +0200
Subject: [PATCH 07/57] New test release v1.11.12-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 0be4f8f..6ecf8c3 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461
+Subproject commit 6ecf8c30e0f96bd078dbdcd421f48418f54a91ed
diff --git a/element-web b/element-web
index ef58800..a75d0d9 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca
+Subproject commit a75d0d9055906f44503acb8f1152260e02c6547f
diff --git a/matrix-js-sdk b/matrix-js-sdk
index c2f7795..9b20f5c 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db
+Subproject commit 9b20f5c3ef02568ee302f0c6ed633f07f7f8e498
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 0d5ad44..68f9948 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b
+Subproject commit 68f99488f590bb3623ee2bcf096a697e8d38505b

From 6bc26949c13a4153061ed2692830c6804e7b6ea1 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 30 Oct 2022 12:08:59 +0100
Subject: [PATCH 08/57] New test release v1.11.12-sc.0.test.2

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index 6ecf8c3..87b2e3d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 6ecf8c30e0f96bd078dbdcd421f48418f54a91ed
+Subproject commit 87b2e3d7a3158c999b480e13fb23ab5774237dd9
diff --git a/element-web b/element-web
index a75d0d9..886408b 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit a75d0d9055906f44503acb8f1152260e02c6547f
+Subproject commit 886408b58153fb15f9691c6ac0f3c31aec40f261
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 68f9948..e3761d8 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 68f99488f590bb3623ee2bcf096a697e8d38505b
+Subproject commit e3761d887d8987f4b97b567962bb453f901c5f72

From e26d244c1eafe9e128ab1a35cbd6eb927a943713 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Fri, 4 Nov 2022 21:17:04 +0100
Subject: [PATCH 09/57] New test release v1.11.13-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 87b2e3d..4912004 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 87b2e3d7a3158c999b480e13fb23ab5774237dd9
+Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6
diff --git a/element-web b/element-web
index 886408b..2abfc19 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 886408b58153fb15f9691c6ac0f3c31aec40f261
+Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 9b20f5c..679ba69 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 9b20f5c3ef02568ee302f0c6ed633f07f7f8e498
+Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9
diff --git a/matrix-react-sdk b/matrix-react-sdk
index e3761d8..eb43745 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit e3761d887d8987f4b97b567962bb453f901c5f72
+Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1

From 3c405aeaf65d62b0a68b905ac6e6ae652965a159 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 5 Nov 2022 20:22:09 +0100
Subject: [PATCH 10/57] New release v1.11.13-sc.1

---
 element-desktop | 2 +-
 element-web     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/element-desktop b/element-desktop
index 4912004..3d6ff48 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6
+Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac
diff --git a/element-web b/element-web
index 2abfc19..1f45edd 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c
+Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2

From b6fe9591539bcc47dc10f61e1717f225a8012a07 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 5 Nov 2022 22:41:56 +0100
Subject: [PATCH 11/57] =?UTF-8?q?Meh,=20flathub=20seems=20to=20require=20P?=
 =?UTF-8?q?Rs=20now=20=F0=9F=90=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/update-flathub.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh
index 31c4ce5..7451aec 100755
--- a/deploy/update-flathub.sh
+++ b/deploy/update-flathub.sh
@@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath)
 pushd "$repopath" > /dev/null
 
 git fetch
+git checkout master
 git reset --hard origin/master
 
+git checkout -B "release-v$version"
+
 yamlFile="chat.schildi.desktop.yaml"
 xmlFile="chat.schildi.desktop.metainfo.xml"
 
@@ -33,8 +36,8 @@ sed -i "s|^\s\s<releases>$|  <releases>\n    <release version=\"$version\" date=
 git add $yamlFile $xmlFile
 git commit -m "Bump version to v$version"
 
-git push
+git push -f --set-upstream origin "release-v$version"
 
 popd > /dev/null
 
-echo "Release v$version published on flathub!"
+echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"

From 0bfa5733d5e50816c6d15a24392606b5f0d06e98 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 12 Nov 2022 11:28:31 +0100
Subject: [PATCH 12/57] New test release v1.11.14-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 3d6ff48..07d1283 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac
+Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00
diff --git a/element-web b/element-web
index 1f45edd..d7e4930 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2
+Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 679ba69..1474204 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9
+Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676
diff --git a/matrix-react-sdk b/matrix-react-sdk
index eb43745..c9fb6bb 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1
+Subproject commit c9fb6bbbb8bf97802277127601163618669acdee

From 92ac040175759ff476bc6aada6874f485dd4a118 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 15 Nov 2022 23:39:05 +0100
Subject: [PATCH 13/57] Renovate config.json - default_server_name -->
 default_server_config - Add more room directories

---
 configs/sc/config.json | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/configs/sc/config.json b/configs/sc/config.json
index 2916dee..4af6da3 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -1,6 +1,11 @@
 {
     "update_base_url": null,
-    "default_server_name": "matrix.org",
+    "default_server_config": {
+        "m.homeserver": {
+            "base_url": "https://matrix-client.matrix.org",
+            "server_name": "matrix.org"
+        }
+    },
     "brand": "SchildiChat",
     "integrations_ui_url": "https://scalar.vector.im/",
     "integrations_rest_url": "https://scalar.vector.im/api",
@@ -14,7 +19,10 @@
     "showLabsSettings": true,
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im",
+            "libera.chat",
+            "schildi.chat"
         ]
     },
     "enable_presence_by_hs_url": {

From 51e7d4b67b71543370c88277007983e51f7a6154 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 26 Nov 2022 00:30:33 +0100
Subject: [PATCH 14/57] New test release v1.11.15-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 07d1283..dd74e36 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00
+Subproject commit dd74e3628176f0ad39097325e5603fec51408a83
diff --git a/element-web b/element-web
index d7e4930..fcf043c 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b
+Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 1474204..6128de1 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676
+Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
diff --git a/matrix-react-sdk b/matrix-react-sdk
index c9fb6bb..0ad473a 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit c9fb6bbbb8bf97802277127601163618669acdee
+Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e

From fc27cbfd7476e5b494349e288c6d04e7d5f881c1 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 4 Dec 2022 02:37:55 +0100
Subject: [PATCH 15/57] Allow building using containers

Co-authored-by: Paarth Shah <mail@shahpaarth.com>

Closes #145
---
 .containerignore     |  1 +
 Containerfile.debian | 30 ++++++++++++++++++++++++++++++
 Containerfile.fedora | 20 ++++++++++++++++++++
 Makefile             | 25 +++++++++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100644 .containerignore
 create mode 100644 Containerfile.debian
 create mode 100644 Containerfile.fedora

diff --git a/.containerignore b/.containerignore
new file mode 100644
index 0000000..ae02570
--- /dev/null
+++ b/.containerignore
@@ -0,0 +1 @@
+release/
\ No newline at end of file
diff --git a/Containerfile.debian b/Containerfile.debian
new file mode 100644
index 0000000..041c64e
--- /dev/null
+++ b/Containerfile.debian
@@ -0,0 +1,30 @@
+ARG NODE_VERSION
+FROM node:${NODE_VERSION}
+
+RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \
+    curl \
+    g++ \
+    gcc \
+    git \
+    jq \
+    libarchive-tools \
+    libsecret-1-dev \
+    libsqlcipher-dev \
+    libssl-dev \
+    make \
+    openssl \
+    pkg-config \
+    python \
+    tcl \
+    vim
+
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal
+
+COPY . /project
+WORKDIR /project
+
+# There might be remnants of the host which break the build
+RUN make fixup
\ No newline at end of file
diff --git a/Containerfile.fedora b/Containerfile.fedora
new file mode 100644
index 0000000..279d43f
--- /dev/null
+++ b/Containerfile.fedora
@@ -0,0 +1,20 @@
+FROM fedora:latest
+
+RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
+
+# node setup
+ARG NODE_VERSION
+RUN mkdir -p /usr/local/n
+RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share
+RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n
+RUN bash n ${NODE_VERSION}
+RUN npm install -g n
+RUN npm install -g yarn
+RUN npm install -g node-gyp
+RUN gem install --ignore-dependencies --no-user-install --no-document fpm
+
+COPY . /project
+WORKDIR /project
+
+# There might be remnants of the host which break the build
+RUN make fixup
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 21c3bf4..c517e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
 .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
 .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release
 .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns
+.PHONY: container-build-debian container-build-fedora
+.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
 .PHONY: clean undo_setup fixup
 
 CFGDIR ?= configs/sc
@@ -8,6 +10,8 @@ CFGDIR ?= configs/sc
 all: web
 
 YARN ?= yarnpkg
+CONTAINER_ENGINE ?= podman
+NODE_VERSION ?= 16
 
 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|')
 WEB_APP_NAME :=  $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|')
@@ -32,6 +36,9 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION)
 OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg
 OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app
 
+CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian
+CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora
+
 RELEASE_DIR := release
 CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION)
 
@@ -153,6 +160,24 @@ macos-mas-release: macos-mas
 	mkdir -p $(CURRENT_RELEASE_DIR)
 	cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR)
 
+container-build-debian:
+	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) .
+
+container-build-fedora:
+	$(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) .
+
+container-web-release: container-build-debian
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release
+
+container-debian-release: container-build-debian
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release
+
+container-rpm-release: container-build-fedora
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release
+
+container-appimage-release: container-build-debian
+	$(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release
+
 bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock
 	./build-bom.sh
 bom: bom.lock

From a4ab5f55c92db470926b80239e14a1a132ff4fec Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 4 Dec 2022 02:56:38 +0100
Subject: [PATCH 16/57] New test release v1.11.15-sc.0.test.2

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index dd74e36..d25e426 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit dd74e3628176f0ad39097325e5603fec51408a83
+Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b
diff --git a/element-web b/element-web
index fcf043c..ebb0d6a 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d
+Subproject commit ebb0d6a212299540247587abd345ce633a414813
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 0ad473a..23de404 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e
+Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951

From eb17c2ad9459437d06d834307b4d5ff23051f80a Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 6 Dec 2022 20:08:30 +0100
Subject: [PATCH 17/57] New test release v1.11.16-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index d25e426..dfc6afa 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b
+Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de
diff --git a/element-web b/element-web
index ebb0d6a..91850ae 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit ebb0d6a212299540247587abd345ce633a414813
+Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 6128de1..789e2bf 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
+Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 23de404..2d34475 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951
+Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70

From 9d4602fea6068e42e02a0edfdb4efcd7407d0b57 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Fri, 23 Dec 2022 10:14:00 +0100
Subject: [PATCH 18/57] Add stale automation github action

---
 .github/workflows/stale.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 0000000..674a67d
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,17 @@
+name: 'Close stale issues'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v6
+        with:
+          stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
+          days-before-issue-stale: 150
+          days-before-issue-close: 14
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure'

From 775fb00b75bb2c245ddbfedb6d0fd098f5ab8595 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 15 Jan 2023 12:31:07 +0100
Subject: [PATCH 19/57] Adjust default config.json to changed property names

---
 configs/sc/config.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/sc/config.json b/configs/sc/config.json
index 4af6da3..0402a78 100644
--- a/configs/sc/config.json
+++ b/configs/sc/config.json
@@ -16,8 +16,8 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "showLabsSettings": true,
-    "roomDirectory": {
+    "show_labs_settings": true,
+    "room_directory": {
         "servers": [
             "matrix.org",
             "gitter.im",

From 965a3b2d0e7df545105e084c82e26de0ff6ef03b Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 15 Jan 2023 12:33:34 +0100
Subject: [PATCH 20/57] New test release v1.11.17-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index dfc6afa..86f7509 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de
+Subproject commit 86f7509f07039d94f43c3736518425eef0d43b3a
diff --git a/element-web b/element-web
index 91850ae..02ec7bb 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55
+Subproject commit 02ec7bb3b0ffa47aca0d59a92788ef55ef481e78
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 789e2bf..b9afe23 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f
+Subproject commit b9afe2320caee4969dc64c09ba680f0041e3ca5a
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 2d34475..7ebde05 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70
+Subproject commit 7ebde053f052965a463ab5b710110be33a2f4a1c

From db908634ea8d9deb21e1972d21efdf24a846e6b7 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 19 Jan 2023 18:22:08 +0100
Subject: [PATCH 21/57] New test release v1.11.19-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 86f7509..6e19b2e 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 86f7509f07039d94f43c3736518425eef0d43b3a
+Subproject commit 6e19b2eae6fa3e362d25166655c419f90d70f2db
diff --git a/element-web b/element-web
index 02ec7bb..172df12 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 02ec7bb3b0ffa47aca0d59a92788ef55ef481e78
+Subproject commit 172df12d60ea12d00cec7c2e0dbc4607356e4a4e
diff --git a/matrix-js-sdk b/matrix-js-sdk
index b9afe23..e6c127a 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit b9afe2320caee4969dc64c09ba680f0041e3ca5a
+Subproject commit e6c127a392ec5165ce348b84ff1290efbef0f1cb
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 7ebde05..bba6767 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 7ebde053f052965a463ab5b710110be33a2f4a1c
+Subproject commit bba676718ad4f5de627909036804f5b050af71f7

From 32f58e1c3fb1ae37742d2a7115789a8a67ac2f8f Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Mon, 30 Jan 2023 23:43:21 +0100
Subject: [PATCH 22/57] New test release v1.11.20-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 6e19b2e..8f68fc6 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 6e19b2eae6fa3e362d25166655c419f90d70f2db
+Subproject commit 8f68fc6612d1ca13fe97df744ad2538da1f9ade7
diff --git a/element-web b/element-web
index 172df12..62767ba 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 172df12d60ea12d00cec7c2e0dbc4607356e4a4e
+Subproject commit 62767baf0e17758cce1422614028869d90ba68a4
diff --git a/matrix-js-sdk b/matrix-js-sdk
index e6c127a..d89e210 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit e6c127a392ec5165ce348b84ff1290efbef0f1cb
+Subproject commit d89e210512f102196c66045c69ee69d767468b4b
diff --git a/matrix-react-sdk b/matrix-react-sdk
index bba6767..dd020a8 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit bba676718ad4f5de627909036804f5b050af71f7
+Subproject commit dd020a8866e8ee321f4ec403f410dc6ada265171

From ae4eb4c3da22d66dfc629c331c66f8fb60b8174f Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 1 Feb 2023 16:51:20 +0100
Subject: [PATCH 23/57] New test release v1.11.22-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 8f68fc6..a8168fb 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 8f68fc6612d1ca13fe97df744ad2538da1f9ade7
+Subproject commit a8168fb79b04960843f66d4b1975229b693ce9e3
diff --git a/element-web b/element-web
index 62767ba..1424333 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 62767baf0e17758cce1422614028869d90ba68a4
+Subproject commit 14243333d9796685680117cd7f9e569af07941a7
diff --git a/matrix-js-sdk b/matrix-js-sdk
index d89e210..7158a99 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit d89e210512f102196c66045c69ee69d767468b4b
+Subproject commit 7158a99a1caf5cf9d780b19f1829a1257c8a5df3
diff --git a/matrix-react-sdk b/matrix-react-sdk
index dd020a8..a29fbec 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit dd020a8866e8ee321f4ec403f410dc6ada265171
+Subproject commit a29fbec8465ed803e44c386395bf81945b417175

From 87e7893d0769d3c7fdc25920ef5a7378879c5de6 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 1 Feb 2023 20:32:07 +0100
Subject: [PATCH 24/57] New release v1.11.22-sc.1

---
 element-desktop | 2 +-
 element-web     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/element-desktop b/element-desktop
index a8168fb..5716dd1 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit a8168fb79b04960843f66d4b1975229b693ce9e3
+Subproject commit 5716dd17a2dbe5428bb3223ba6e3a8a2dd9e4973
diff --git a/element-web b/element-web
index 1424333..bfbdf4f 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 14243333d9796685680117cd7f9e569af07941a7
+Subproject commit bfbdf4f837ded883484eca1cfaedca2dd4b25b8a

From b0177a42763e9724273973f71332c79e47b6d5f7 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Fri, 3 Feb 2023 06:39:37 +0000
Subject: [PATCH 25/57] Translated using Weblate (Czech)

Currently translated at 100.0% (51 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/cs/
---
 i18n-overlays/matrix-react-sdk/cs.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json
index 861e944..c07e3a1 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -21,8 +21,8 @@
     "MXID": "MXID",
     "In group chats": "Ve skupinových chatech",
     "In public rooms": "Ve veřejných místnostech",
-    "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v domovském zobrazení.",
-    "Show all rooms in Home": "Ukázat všechny místnosti v domovském zobrazení",
+    "All rooms you're in will appear in Home.": "Všechny místnosti, ve kterých se nacházíte, se zobrazí v Úvodu.",
+    "Show all rooms in Home": "Zobrazit všechny místnosti v Úvodu",
     "Show people in spaces": "Ukázat lidi v prostorech",
     "Show notification badges for People in Spaces": "Zobrazit odznaky oznámení pro Lidé v prostorech",
     "Return to the room previously opened in a space": "Návrat do dříve otevřené místnosti v prostoru",

From 2066ef2623ae01f24383c9d8ed95943238205267 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 1 Mar 2023 00:21:34 +0100
Subject: [PATCH 26/57] New test release v1.11.23-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 5716dd1..b4a7f5e 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 5716dd17a2dbe5428bb3223ba6e3a8a2dd9e4973
+Subproject commit b4a7f5eb21fcc5e4efc8616f819f382b8fd72195
diff --git a/element-web b/element-web
index bfbdf4f..8aee83a 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit bfbdf4f837ded883484eca1cfaedca2dd4b25b8a
+Subproject commit 8aee83a35cba668b65a02460cd10a5f614c931d5
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 7158a99..f94634a 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 7158a99a1caf5cf9d780b19f1829a1257c8a5df3
+Subproject commit f94634a6dce0e08530c39bcc0c824d093dc93ba7
diff --git a/matrix-react-sdk b/matrix-react-sdk
index a29fbec..4bf0df2 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit a29fbec8465ed803e44c386395bf81945b417175
+Subproject commit 4bf0df2b3dfadda74a33a566b1a99f9c2b98184a

From 0ef609f57b5306956a756ff39e025df0ade5125f Mon Sep 17 00:00:00 2001
From: Felipe Nogueira <contato.fnog@gmail.com>
Date: Thu, 2 Mar 2023 18:27:57 +0000
Subject: [PATCH 27/57] Translated using Weblate (Portuguese (Brazil))

Currently translated at 82.3% (42 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/pt_BR/
---
 i18n-overlays/matrix-react-sdk/pt_BR.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json
index 5bac536..1b4c8af 100644
--- a/i18n-overlays/matrix-react-sdk/pt_BR.json
+++ b/i18n-overlays/matrix-react-sdk/pt_BR.json
@@ -40,5 +40,6 @@
     "Room list style": "Estilo da lista de salas",
     "Mark rooms as unread": "Permitir markar conversas como não lidos",
     "Mark as unread": "Markar como não lido",
-    "Mark as read": "Markar como lido"
+    "Mark as read": "Markar como lido",
+    "Collapse additional buttons": "Recolher botões adicionais"
 }

From d977e5c753f7762e081ddb1438771c5b41f2849e Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 15 Mar 2023 21:43:57 +0100
Subject: [PATCH 28/57] New test release v1.11.24-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index b4a7f5e..23da578 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit b4a7f5eb21fcc5e4efc8616f819f382b8fd72195
+Subproject commit 23da57819919e4c952c943d391261d1603036be4
diff --git a/element-web b/element-web
index 8aee83a..1f0b06d 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 8aee83a35cba668b65a02460cd10a5f614c931d5
+Subproject commit 1f0b06df1402ca6b2559bccead05446b9df8a5eb
diff --git a/matrix-js-sdk b/matrix-js-sdk
index f94634a..0c0854b 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit f94634a6dce0e08530c39bcc0c824d093dc93ba7
+Subproject commit 0c0854b86419876835d1c6930a3b0c4d9861d3e5
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 4bf0df2..7a814df 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 4bf0df2b3dfadda74a33a566b1a99f9c2b98184a
+Subproject commit 7a814df97f2afafbb1c0181e6b2996113bfbc971

From 2e3d370c38d1c4f8b8ece97701324c8db4be1e79 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 16 Mar 2023 00:10:51 +0100
Subject: [PATCH 29/57] New test release v1.11.25-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 23da578..b1a985e 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 23da57819919e4c952c943d391261d1603036be4
+Subproject commit b1a985e12802af8e3d2bf5440477f32bf9513b72
diff --git a/element-web b/element-web
index 1f0b06d..8f5c3d2 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 1f0b06df1402ca6b2559bccead05446b9df8a5eb
+Subproject commit 8f5c3d28afdab73e2a67e4f570ab9fa8988709ac
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 0c0854b..589938f 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 0c0854b86419876835d1c6930a3b0c4d9861d3e5
+Subproject commit 589938f71d50c55a78f7c3d5a7e54110e35279e0
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 7a814df..1cea13f 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 7a814df97f2afafbb1c0181e6b2996113bfbc971
+Subproject commit 1cea13f3c55f353fd3bac1110214de54ba3d6ade

From 788816299c5ed68c0d451e6eac29e2917867d401 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 28 Mar 2023 20:59:25 +0200
Subject: [PATCH 30/57] New release v1.11.26-sc.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index b1a985e..1c4c88b 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit b1a985e12802af8e3d2bf5440477f32bf9513b72
+Subproject commit 1c4c88b45928b4a56cd770ba677f2fc4e2bf6b01
diff --git a/element-web b/element-web
index 8f5c3d2..5bcb0a1 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 8f5c3d28afdab73e2a67e4f570ab9fa8988709ac
+Subproject commit 5bcb0a17dda5f74f7edd5c1064fb12484527d7d8
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 589938f..738c29c 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 589938f71d50c55a78f7c3d5a7e54110e35279e0
+Subproject commit 738c29c7c32187d2d9cdda0aca998b6946acb746
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 1cea13f..916a4d6 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 1cea13f3c55f353fd3bac1110214de54ba3d6ade
+Subproject commit 916a4d6275b92f716fd64af243eb7ebfc56d73e1

From b3516d16213dee33ac2cacfce02ed677396d2f20 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sun, 2 Apr 2023 02:30:27 +0200
Subject: [PATCH 31/57] New test release v1.11.28-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index 1c4c88b..55a5d81 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 1c4c88b45928b4a56cd770ba677f2fc4e2bf6b01
+Subproject commit 55a5d81ef815546fb2d2967896b77ab61410196e
diff --git a/element-web b/element-web
index 5bcb0a1..a46cb30 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 5bcb0a17dda5f74f7edd5c1064fb12484527d7d8
+Subproject commit a46cb302c74ebdb7bdc226f295b7e1ed264f199d
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 916a4d6..becb561 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 916a4d6275b92f716fd64af243eb7ebfc56d73e1
+Subproject commit becb56166ec8cc5fbfb42440bbad42f5bb0f485a

From c5042532eb1f774260e83ab9b745c1745a76f04b Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Fri, 7 Apr 2023 12:57:44 +0200
Subject: [PATCH 32/57] automatic_i18n_adjustment: It's still Element Call

---
 i18n-helper/index.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/i18n-helper/index.js b/i18n-helper/index.js
index f226e47..11e3fc4 100644
--- a/i18n-helper/index.js
+++ b/i18n-helper/index.js
@@ -35,7 +35,13 @@ function writeStrings(p, strings) {
 		let strings = readStrings(p);
 
 		for (const key of Object.keys(strings)) {
-			strings[key] = strings[key].replace(/Element/g, "SchildiChat").replace(/element\.io/g, "schildi.chat");
+			strings[key] = strings[key]
+				.replace(/Element/g, "SchildiChat")
+				.replace(/element\.io/g, "schildi.chat")
+				
+				// It's still Element Call
+				.replace(/SchildiChat Call/g, "Element Call")
+				.replace(/SchildiChat-Call/g, "Element-Call");
 		}
 
 		if (overlayPath) {

From 0ecdbb1bb821036b39fd28212177b433cb363778 Mon Sep 17 00:00:00 2001
From: Michele Agostinelli <michele@agostinelli.eu>
Date: Fri, 17 Mar 2023 08:42:42 +0000
Subject: [PATCH 33/57] Translated using Weblate (Italian)

Currently translated at 62.7% (32 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/it/
---
 i18n-overlays/matrix-react-sdk/it.json | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/it.json b/i18n-overlays/matrix-react-sdk/it.json
index 72a5b3a..187e9c4 100644
--- a/i18n-overlays/matrix-react-sdk/it.json
+++ b/i18n-overlays/matrix-react-sdk/it.json
@@ -9,5 +9,26 @@
     "Light theme": "Tema chiaro",
     "Dark theme": "Tema scuro",
     "Normal priority": "Priorità normale",
-    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)"
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Vuoi entrare in una stanza che ti notificherà riguardo nuove release? Sarebbe comodo particolarmente se la tua piattaforma non supporta aggiornamenti automatici (Come per esempio Windows o MacOS.)",
+    "Show message bubbles on one side only": "Visualizza bolle messaggi su un lato solo",
+    "Show message bubbles depending on the width either on both sides or only on one side": "Visualizza bolle messaggi in base alla lunghezza di entrambi i lati o di uno solo",
+    "User name color mode": "Modalità colore nome utente",
+    "Room list style": "Stile lista stanze",
+    "Theme": "Tema",
+    "Show all rooms in Home": "Visualizza tutte le stanze nella Home",
+    "All rooms you're in will appear in Home.": "Tutte le stanze in cui partecipi appariranno nella Home.",
+    "For people": "Per le persone",
+    "Room list": "Lista stanze",
+    "Show advanced theme settings": "Visualizza impostazioni avanzate tema",
+    "Mark rooms as unread": "Permetti di segnare le chat come non lette",
+    "Message bubbles": "Bolle messaggi",
+    "Message layout": "Impaginazione messaggi",
+    "Mark as unread": "Segna come non letto",
+    "Uniform": "Uniforme",
+    "Show people in spaces": "Visualizza persone negli spazi",
+    "MXID": "MXID",
+    "In public rooms": "Nelle stanze pubbliche",
+    "In group chats": "Nelle chat di gruppo",
+    "Font size and typeface": "Dimensione e tipo carattere",
+    "Hide advanced theme settings": "Nascondi impostazioni avanzate tema"
 }

From 219c0e3cf737df40360815efd3712ce161f6d046 Mon Sep 17 00:00:00 2001
From: misibacsi <tesztuser2813@gmail.com>
Date: Thu, 20 Apr 2023 06:02:09 +0000
Subject: [PATCH 34/57] Translated using Weblate (Hungarian)

Currently translated at 100.0% (1 of 1 strings)

Translation: SchildiChat/schildichat-deskop/element-desktop
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/element-desktop/hu/
---
 i18n-overlays/element-desktop/hu.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/element-desktop/hu.json b/i18n-overlays/element-desktop/hu.json
index 0967ef4..8598663 100644
--- a/i18n-overlays/element-desktop/hu.json
+++ b/i18n-overlays/element-desktop/hu.json
@@ -1 +1,3 @@
-{}
+{
+    "Show": "Mutat"
+}

From 1e0e3b718c32eec5495be1486e13d68fb06d7591 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Fri, 21 Apr 2023 12:32:00 +0200
Subject: [PATCH 35/57] New test release v1.11.29-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 55a5d81..46a18d2 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 55a5d81ef815546fb2d2967896b77ab61410196e
+Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4
diff --git a/element-web b/element-web
index a46cb30..a21fcb8 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit a46cb302c74ebdb7bdc226f295b7e1ed264f199d
+Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 738c29c..af4413b 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 738c29c7c32187d2d9cdda0aca998b6946acb746
+Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1
diff --git a/matrix-react-sdk b/matrix-react-sdk
index becb561..1d04bb0 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit becb56166ec8cc5fbfb42440bbad42f5bb0f485a
+Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d

From 40c598e91b4cc21df066e49a0777015354a686a6 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Fri, 21 Apr 2023 12:37:58 +0200
Subject: [PATCH 36/57] llvm15 seems to be necessary for Fedora 38 with rust

---
 Containerfile.fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Containerfile.fedora b/Containerfile.fedora
index 279d43f..501c662 100644
--- a/Containerfile.fedora
+++ b/Containerfile.fedora
@@ -1,6 +1,6 @@
 FROM fedora:latest
 
-RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
+RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
 
 # node setup
 ARG NODE_VERSION

From 10a511228584d6e14cb1c0257946fb93bdf8ae3e Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Fri, 21 Apr 2023 12:47:41 +0200
Subject: [PATCH 37/57] ruby fpm also needs its dependencies for Fedora

---
 Containerfile.fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Containerfile.fedora b/Containerfile.fedora
index 501c662..21b905f 100644
--- a/Containerfile.fedora
+++ b/Containerfile.fedora
@@ -11,7 +11,7 @@ RUN bash n ${NODE_VERSION}
 RUN npm install -g n
 RUN npm install -g yarn
 RUN npm install -g node-gyp
-RUN gem install --ignore-dependencies --no-user-install --no-document fpm
+RUN gem install --no-user-install --no-document fpm
 
 COPY . /project
 WORKDIR /project

From 979be00158bd0c211553d5bdce17663e34ad6c13 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 22 Apr 2023 10:10:55 +0200
Subject: [PATCH 38/57] Add script to completely reset repos from leftovers

---
 hard_reset_repos.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100755 hard_reset_repos.sh

diff --git a/hard_reset_repos.sh b/hard_reset_repos.sh
new file mode 100755
index 0000000..4e17e2a
--- /dev/null
+++ b/hard_reset_repos.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+mydir="$(dirname "$(realpath "$0")")"
+
+cd "$mydir"
+
+source ./merge_helpers.sh
+
+# Note: this doesn't delete files starting with a dot,
+# and in particular not the '.git' directory, which we
+# want to keep
+forall_repos bash -c 'rm -rf *'
+forall_repos git reset HEAD --hard

From 0eb99a6a606c6917f6676c2d4abcecaf1848d0f4 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 22 Apr 2023 10:11:16 +0200
Subject: [PATCH 39/57] Make fixup: also check if yarn cache is broken and
 clean it if necessary

If `yarn cache list` fails, this can also lead to weird errors during
fixup, like
```
error /schildichat-desktop/matrix-react-sdk/node_modules/cypress: Command failed.
Exit code: 1
Command: node index.js --exec install
Arguments:
Directory: /schildichat-desktop/matrix-react-sdk/node_modules/cypress
Output:
node:internal/modules/cjs/loader:433
      throw err;
      ^

Error: Cannot find module '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals/build/src/main.js'. Please verify that the package.json has a valid "main" entry
    at tryPackage (node:internal/modules/cjs/loader:425:19)
    at Function.Module._findPath (node:internal/modules/cjs/loader:638:18)
    at Function.Module._resolveFilename (node:internal/modules/cjs/loader:1012:27)
    at Function.Module._load (node:internal/modules/cjs/loader:871:27)
    at Module.require (node:internal/modules/cjs/loader:1098:19)
    at require (node:internal/modules/cjs/helpers:108:18)
    at Object.<anonymous> (/schildichat-desktop/matrix-react-sdk/node_modules/execa/lib/error.js:2:25)
    at Module._compile (node:internal/modules/cjs/loader:1196:14)
    at Object.Module._extensions..js (node:internal/modules/cjs/loader:1250:10)
    at Module.load (node:internal/modules/cjs/loader:1074:32) {
  code: 'MODULE_NOT_FOUND',
  path: '/schildichat-desktop/matrix-react-sdk/node_modules/human-signals
```
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c517e5b..205cea9 100644
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,7 @@
 .PHONY: container-build-debian container-build-fedora
 .PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release
 .PHONY: clean undo_setup fixup
+.PHONY: fix_yarn_cache
 
 CFGDIR ?= configs/sc
 
@@ -182,6 +183,9 @@ bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.loc
 	./build-bom.sh
 bom: bom.lock
 
+fix_yarn_cache:
+	$(YARN) cache list || $(YARN) cache clean
+
 clean:
 	$(YARN) --cwd matrix-js-sdk clean
 	$(YARN) --cwd matrix-react-sdk clean
@@ -195,7 +199,7 @@ clean:
 undo_setup:
 	rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak
 
-fixup: undo_setup
+fixup: undo_setup fix_yarn_cache
 	make setup
 	make clean
 	make setup

From 5122f0e870ed94d17f459c8cf0a13f1be501d147 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 22 Apr 2023 12:23:03 +0200
Subject: [PATCH 40/57] Add missing string for freeform reactions

---
 i18n-overlays/matrix-react-sdk/en_EN.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json
index 7732df7..2c59706 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -49,5 +49,6 @@
     "Mixed": "Mixed",
     "Sound pack": "Sound pack",
     "Schildi: Softer sounds for reduced anxiety": "Schildi: Softer sounds for reduced anxiety",
-    "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element"
+    "Classic: The same sharp sounds as Element": "Classic: The same sharp sounds as Element",
+    "React with \"%(reaction)s\"": "React with \"%(reaction)s\""
 }

From 64557e1da945d6c85db3d4f9bd95c7931bdfa2c8 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 22 Apr 2023 12:25:37 +0200
Subject: [PATCH 41/57] New test release v1.11.29-sc.0.test.2

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index 46a18d2..ba31f4b 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 46a18d2dfd420cc1f654fbb218ed97d64a22b8f4
+Subproject commit ba31f4b8c3194f352ba1ec9bbd1517950f0bf754
diff --git a/element-web b/element-web
index a21fcb8..2e5ba06 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit a21fcb8fbf4bf1026c0cbcc813af9ea618e62743
+Subproject commit 2e5ba06a3b118347e0f6437328b8f91dbfb53999
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 1d04bb0..d53a6e0 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 1d04bb0f28a0581a6ea93aa21cdac25843c9bb4d
+Subproject commit d53a6e02420cfb19794b1c1732a1da23765c7023

From 1a485faf72af8aa6316e6c7194b7ae18ebe0d051 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 22 Apr 2023 12:30:03 +0200
Subject: [PATCH 42/57] New test release v1.11.29-sc.0.test.3

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index ba31f4b..ca3c38e 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit ba31f4b8c3194f352ba1ec9bbd1517950f0bf754
+Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca
diff --git a/element-web b/element-web
index 2e5ba06..d8643e4 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 2e5ba06a3b118347e0f6437328b8f91dbfb53999
+Subproject commit d8643e4983b11a87831af1729037976d14641454
diff --git a/matrix-react-sdk b/matrix-react-sdk
index d53a6e0..21ecba2 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit d53a6e02420cfb19794b1c1732a1da23765c7023
+Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341

From f9ab1ef2e02d3aaa58ff74cb1b71d4cf5d7509b4 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 25 Apr 2023 22:59:51 +0200
Subject: [PATCH 43/57] New release v1.11.30-sc.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index ca3c38e..a8b266d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit ca3c38e98d79a852098df85612fb0c21989d88ca
+Subproject commit a8b266dd964b97282caaa4c43a90e9bf6a95f9a4
diff --git a/element-web b/element-web
index d8643e4..2ca5291 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit d8643e4983b11a87831af1729037976d14641454
+Subproject commit 2ca5291da7501ee50d3f24717cdfcb8d27aebfe5
diff --git a/matrix-js-sdk b/matrix-js-sdk
index af4413b..c0ab637 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit af4413b7a681d5f590b7674d87b3a103086705d1
+Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 21ecba2..d8cf78a 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 21ecba234658a89d22eccb33429d3770b7a28341
+Subproject commit d8cf78aa21f2aeb8ab444a4dd3d7e9f90fea59b2

From be44d4a1a651383b04e4e1e6f68b7f8b9524f9a2 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 25 Apr 2023 23:23:49 +0200
Subject: [PATCH 44/57] New release v1.11.30-sc.2

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index a8b266d..2f54ef6 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit a8b266dd964b97282caaa4c43a90e9bf6a95f9a4
+Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3
diff --git a/element-web b/element-web
index 2ca5291..f3e6edb 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 2ca5291da7501ee50d3f24717cdfcb8d27aebfe5
+Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd
diff --git a/matrix-react-sdk b/matrix-react-sdk
index d8cf78a..9e45813 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit d8cf78aa21f2aeb8ab444a4dd3d7e9f90fea59b2
+Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96

From 0ba494e9559ab39a4dd0a936c3d33b9f09ac064b Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Tue, 25 Apr 2023 23:53:41 +0200
Subject: [PATCH 45/57] Use llvm instead llvm15 for Fedora

---
 Containerfile.fedora | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Containerfile.fedora b/Containerfile.fedora
index 21b905f..a61578c 100644
--- a/Containerfile.fedora
+++ b/Containerfile.fedora
@@ -1,6 +1,6 @@
 FROM fedora:latest
 
-RUN dnf install -y openssl openssl-devel rust cargo llvm15 libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
+RUN dnf install -y openssl openssl-devel rust cargo llvm libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat
 
 # node setup
 ARG NODE_VERSION
@@ -17,4 +17,4 @@ COPY . /project
 WORKDIR /project
 
 # There might be remnants of the host which break the build
-RUN make fixup
\ No newline at end of file
+RUN make fixup

From a8be3ffcde6d55a6388450ca84bb9b281cb37a6a Mon Sep 17 00:00:00 2001
From: misibacsi <tesztuser2813@gmail.com>
Date: Sat, 22 Apr 2023 05:07:41 +0000
Subject: [PATCH 46/57] Translated using Weblate (Hungarian)

Currently translated at 50.9% (26 of 51 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/hu/
---
 i18n-overlays/matrix-react-sdk/hu.json | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/hu.json b/i18n-overlays/matrix-react-sdk/hu.json
index a048d36..cde030f 100644
--- a/i18n-overlays/matrix-react-sdk/hu.json
+++ b/i18n-overlays/matrix-react-sdk/hu.json
@@ -3,5 +3,27 @@
     "Show message bubbles on one side only": "Üzenetbuborékok megjelenítése csak az egyik oldalon",
     "Message bubbles": "Üzenet buborékok",
     "Show message bubbles depending on the width either on both sides or only on one side": "Üzenetbuborékok megjelenítése a szélességtől függően mindkét oldalon vagy csak az egyik oldalon",
-    "Normal priority": "Normál prioritás"
+    "Normal priority": "Normál prioritás",
+    "Show people and rooms in a combined list": "Személyek és szobák megjelenítése egy egyesített listában",
+    "Update notifications": "Értesítések frissítése",
+    "Do you want to join a room notifying you about new releases? This is especially useful if your platform doesn't support automatic updates for SchildiChat (e.g. Windows and macOS).": "Szeretne csatlakozni olyan szobához, amely értesíti Önt az új megjelenésekről? Ez különösen akkor hasznos, ha az Ön platformja nem támogatja a SchildiChat automatikus frissítéseit (pl. Windows és macOS).",
+    "System": "Rendszer",
+    "Show all rooms in Home": "Az összes szoba megjelenítése a kezdőoldalon",
+    "All rooms you're in will appear in Home.": "Az összes szoba, amelyben tartózkodik, megjelenik a Kezdőlapon.",
+    "Mark as read": "Olvasottnak jelöl",
+    "Enable YouTube embed player": "YouTube beágyazott lejátszó engedélyezése",
+    "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "A Kezdőlap hasznos ahhoz, hogy mindenről áttekintést kapjunk. Ne feledje, hogy a kikapcsolásával bizonyos szobákat nem fog látni.",
+    "Schildi: Softer sounds for reduced anxiety": "Schildi: Lágyabb hangok a kevesebb stresszért",
+    "Sound pack": "Hangcsomag",
+    "Classic: The same sharp sounds as Element": "Klasszikus: Ugyanazok az éles hangok, mint az Elementnél",
+    "Don't ask again": "Ne kérdezze újra",
+    "Light theme": "Világos téma",
+    "Dark theme": "Sötét téma",
+    "Mark as unread": "Olvasatlannak jelöl",
+    "Collapse additional buttons": "További gombok összecsukása",
+    "Theme": "Téma",
+    "Room list": "Szobák listája",
+    "Font size and typeface": "Betűméret és betűtípus",
+    "Message layout": "Üzenetek elrendezése",
+    "Modern": "Modern"
 }

From 9561c95bb6284bc579b6406e79853fcc9fc5e860 Mon Sep 17 00:00:00 2001
From: waclaw66 <waclaw66@seznam.cz>
Date: Mon, 24 Apr 2023 06:40:18 +0000
Subject: [PATCH 47/57] Translated using Weblate (Czech)

Currently translated at 100.0% (52 of 52 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/cs/
---
 i18n-overlays/matrix-react-sdk/cs.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json
index c07e3a1..a0816fc 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -50,5 +50,6 @@
     "Mixed": "Smíšené",
     "Sound pack": "Balíček zvuků",
     "Schildi: Softer sounds for reduced anxiety": "Schildi: Jemnější zvuky pro snížení úzkosti",
-    "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element"
+    "Classic: The same sharp sounds as Element": "Klasické: Stejně ostré zvuky jako Element",
+    "React with \"%(reaction)s\"": "Reagovat pomocí \"%(reaction)s\""
 }

From 3ac88b91326983e1e833398400fbb096533a3c64 Mon Sep 17 00:00:00 2001
From: Linerly <linerly@protonmail.com>
Date: Sun, 23 Apr 2023 16:40:27 +0000
Subject: [PATCH 48/57] Translated using Weblate (Indonesian)

Currently translated at 100.0% (52 of 52 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/id/
---
 i18n-overlays/matrix-react-sdk/id.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json
index c0d5cbb..3324b6f 100644
--- a/i18n-overlays/matrix-react-sdk/id.json
+++ b/i18n-overlays/matrix-react-sdk/id.json
@@ -49,5 +49,6 @@
     "Mixed": "Campur",
     "Sound pack": "Paket suara",
     "Schildi: Softer sounds for reduced anxiety": "Schildi: Suara lebih lembut untuk mengurangi kecemasan",
-    "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element"
+    "Classic: The same sharp sounds as Element": "Klasik: Suara keras yang biasa seperti Element",
+    "React with \"%(reaction)s\"": "Reaksi dengan \"%(reaction)s\""
 }

From e68cd727722d1a5ddf20b611b45167e545c8c032 Mon Sep 17 00:00:00 2001
From: Xenine <gmail@windwithwind.anonaddy.com>
Date: Sun, 14 May 2023 22:13:08 +0000
Subject: [PATCH 49/57] Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (52 of 52 strings)

Translation: SchildiChat/schildichat-deskop/matrix-react-sdk
Translate-URL: https://weblate.spiritcroc.de/projects/schildichat/matrix-react-sdk/zh_Hans/
---
 i18n-overlays/matrix-react-sdk/zh_Hans.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json
index aef112a..e3e332a 100644
--- a/i18n-overlays/matrix-react-sdk/zh_Hans.json
+++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json
@@ -42,5 +42,13 @@
     "Mark as unread": "标记为未读",
     "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "主页对于概览所有消息来说非常有用。请注意：禁用主页可能会让您无法看到某些房间。",
     "Enable YouTube embed player": "启用 YouTube 嵌入式播放器",
-    "Collapse additional buttons": "折叠额外的按钮"
+    "Collapse additional buttons": "折叠额外的按钮",
+    "Round": "圆角",
+    "React with \"%(reaction)s\"": "与 \"%(reaction)s\" 互动",
+    "Schildi: Softer sounds for reduced anxiety": "Schildi: 舒缓音效以减少焦虑",
+    "Mixed": "混合",
+    "Extra round": "超圆角",
+    "Sound pack": "音频包",
+    "Classic: The same sharp sounds as Element": "Classic: 与 Element 相同的尖锐声音",
+    "Corners": "边缘"
 }

From 143bf7af1e749b39189a2e84eea2d0d971bcdd74 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Mon, 31 Jul 2023 15:11:53 +0200
Subject: [PATCH 50/57] merge-upstream.sh: Allow merging specific version

---
 merge_upstream.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/merge_upstream.sh b/merge_upstream.sh
index cfbea1f..e772262 100755
--- a/merge_upstream.sh
+++ b/merge_upstream.sh
@@ -23,7 +23,13 @@ automatic_i18n_reversion
 automatic_packagejson_reversion
 
 # Merge upstream
-get_latest_upstream_tag
+
+# Check if specific version to merge passed
+if [ -z "$1" ]; then
+    get_latest_upstream_tag
+else
+    latest_upstream_tag="$1"
+fi
 forelement_repos git merge "$latest_upstream_tag"
 
 get_current_mxsdk_tags

From 8a1b9ab40fed4e7993dbfdaf1ef3ea7dfa0224d3 Mon Sep 17 00:00:00 2001
From: Sebastian Walz <sivizius@sivizius.eu>
Date: Tue, 7 Nov 2023 19:27:21 +0100
Subject: [PATCH 51/57] Update flake.lock

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 271a3d0..d010aa2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1633901457,
-        "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=",
+        "lastModified": 1699380656,
+        "narHash": "sha256-H9kQH3J2Z15Ady3zVQsN/tXv8qnRr+p1B0eUkR1bKfE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f358794824b4595d77fec93732485d329ed7b0e0",
+        "rev": "03e7a22654c44489a0a70ea0e237de3e512cd8a6",
         "type": "github"
       },
       "original": {

From 2c9f4caa8b7c667a3760cc7f06871ee1a55fc394 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 13 Dec 2023 02:27:35 +0100
Subject: [PATCH 52/57] New test release v1.11.33-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 2f54ef6..16d3620 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 2f54ef60617db8b5d4a8acdb3ae90721d05de3b3
+Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780
diff --git a/element-web b/element-web
index f3e6edb..e5afedf 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit f3e6edbe968d21abe48fc64cb2fe93fffd69c4fd
+Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c
diff --git a/matrix-js-sdk b/matrix-js-sdk
index c0ab637..255144e 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit c0ab63777e1d1bf2e6756359e66b1e3c0ff54a27
+Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 9e45813..9994f86 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 9e4581350e1b5b78263558ec992090f450e3ac96
+Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e

From 8cf7414a857a47df0e2002105cb1e6e9a3173874 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Wed, 13 Dec 2023 02:28:15 +0100
Subject: [PATCH 53/57] New test release v1.11.33-sc.0.test.2

---
 element-desktop | 2 +-
 element-web     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/element-desktop b/element-desktop
index 16d3620..c221f6c 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 16d3620517cd22e92b52807bc7eb6cc8b4414780
+Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64
diff --git a/element-web b/element-web
index e5afedf..bfa6512 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit e5afedfac20168e491fc9a2b59cd1c8a07c3c35c
+Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06

From cb6f6d990154004fd20d6f215e13909d6c697342 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 22 Feb 2024 19:24:36 +0100
Subject: [PATCH 54/57] New test release v1.11.34-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index c221f6c..000e503 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit c221f6cf768fbc133c744d4869744d8c12c75e64
+Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16
diff --git a/element-web b/element-web
index bfa6512..396585e 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit bfa65127b2f7a68cdb4086a68250bbdade6e3d06
+Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 255144e..10fe11f 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 255144ef2c9e141a171101e18091961f1be6db7f
+Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 9994f86..6a3ee32 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 9994f867123a10b78fae014c3fa1ef919d89487e
+Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34

From 2597454e9626fc4fe91737466c511ec932c7c3e2 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 22 Feb 2024 19:56:41 +0100
Subject: [PATCH 55/57] New test release v1.11.35-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index 000e503..f00d8f6 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 000e503779cba2f211aa487a0bb5625969b37a16
+Subproject commit f00d8f6b3f1ec326e3081a8f4d49abc399e4ef75
diff --git a/element-web b/element-web
index 396585e..8a4b06c 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 396585e92889f53aa3575c0dea921b668c4006e3
+Subproject commit 8a4b06c6bcc134944f58b2ccc0c87b8b9ef29745
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 10fe11f..5d086fe 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 10fe11f7a9d803508f83cbab02899779de53f414
+Subproject commit 5d086fe0a39e15255dcc02cab80ed57ffb6b00a0
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 6a3ee32..3442618 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 6a3ee32cf8df4ad4b84cab1f814eeb26ac0abd34
+Subproject commit 344261869234925f01689eb575fe2bc7013c9547

From 5f41b4c654ca853db3a4c1b0b4c293a8d04940fd Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 24 Feb 2024 19:21:05 +0100
Subject: [PATCH 56/57] New test release v1.11.36-sc.0.test.1

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index f00d8f6..738de77 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit f00d8f6b3f1ec326e3081a8f4d49abc399e4ef75
+Subproject commit 738de7784bddb2285d2f015102e8e2e15877decb
diff --git a/element-web b/element-web
index 8a4b06c..ecf1586 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 8a4b06c6bcc134944f58b2ccc0c87b8b9ef29745
+Subproject commit ecf1586a0f83a9fbce1c95290f1520a64848d894
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 5d086fe..9bbc329 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 5d086fe0a39e15255dcc02cab80ed57ffb6b00a0
+Subproject commit 9bbc329635e1e31f5e72e93ef87ccd90b43de538
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 3442618..3638445 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 344261869234925f01689eb575fe2bc7013c9547
+Subproject commit 363844517bc5e55327c459a0d0f3a3280a975d10

From aae0f2868e8dcf0789dd9ba7290bdde92baca176 Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Sat, 24 Feb 2024 19:37:16 +0100
Subject: [PATCH 57/57] New test release v1.11.36-sc.0.test.2

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-react-sdk | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/element-desktop b/element-desktop
index 738de77..cbd51cb 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit 738de7784bddb2285d2f015102e8e2e15877decb
+Subproject commit cbd51cb2e95298d1992bceaf1b7cd8d0e4fbc786
diff --git a/element-web b/element-web
index ecf1586..ed6795a 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit ecf1586a0f83a9fbce1c95290f1520a64848d894
+Subproject commit ed6795ae7a77235e547193011b9dd54c9e8412b8
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 3638445..361a49f 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 363844517bc5e55327c459a0d0f3a3280a975d10
+Subproject commit 361a49f235d7e267958bfe8dc653e1e777a5861c