From 8ada69cbcd2a25c4bf2248fa31b9a6c1bb592090 Mon Sep 17 00:00:00 2001 From: Shahed Hosseini Date: Sat, 18 Dec 2021 23:46:13 +0000 Subject: [PATCH 01/89] Translated using Weblate (Persian) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/fa/ --- i18n-overlays/element-desktop/fa.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/element-desktop/fa.json b/i18n-overlays/element-desktop/fa.json index 0967ef4..1cb3a76 100644 --- a/i18n-overlays/element-desktop/fa.json +++ b/i18n-overlays/element-desktop/fa.json @@ -1 +1,3 @@ -{} +{ + "Show": "نشان دادن" +} From 50dde2a6837376305322f097dc2f5305508260a7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:29:13 +0100 Subject: [PATCH 02/89] Revert "Every build after a merge is a new test build" This reverts commit 31c746c5d22e260e919ab4afb099d025bc0499b8. --- merge_helpers.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 8c97abf..4b7aed3 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -238,9 +238,6 @@ automatic_packagejson_reversion() { automatic_packagejson_adjustment() { local versions get_current_versions - - # every build after a merge is a new test build - versions[2]=$((versions[2] + 1)) forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json" forelement_repos write_version "package.json" From 5dfc14099363a70589c0a3438a55acaa316e53eb Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:29:51 +0100 Subject: [PATCH 03/89] Let version bumps autocommit everything --- bump_release_version.sh | 8 ++++++++ bump_test_version.sh | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/bump_release_version.sh b/bump_release_version.sh index fc69cf7..3fc5346 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -17,4 +17,12 @@ forall_repos check_clean_git bump_release_version +# Get version string +get_current_versions +get_versions_string + +# Add everything +git add -A +git commit --allow-empty -m "New release v$versions_string" + popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh index 35c3efc..979ed48 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -17,4 +17,12 @@ forall_repos check_clean_git bump_test_version +# Get version string +get_current_versions +get_versions_string + +# Add everything +git add -A +git commit --allow-empty -m "New test release v$versions_string" + popd > /dev/null From 52bfca57fbeb862677aa383638e1d86638d4874c Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:30:13 +0100 Subject: [PATCH 04/89] New test release v1.9.8-sc.0.test.2 --- 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 a074ede..8de9fa8 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a074ede0c13c09dca96a9be2c60d3c4e5c03a234 +Subproject commit 8de9fa89ce509f08d036106af7eeea672f68d764 diff --git a/element-web b/element-web index 94895de..d657fea 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc +Subproject commit d657fea221e85df3b53d95b8058c99ca70e45b7d diff --git a/matrix-js-sdk b/matrix-js-sdk index 09fc7b8..a71dd32 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 09fc7b8ff4035e92821d264e807441f9d4e9da85 +Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d diff --git a/matrix-react-sdk b/matrix-react-sdk index 2fd5a96..e08a81f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f +Subproject commit e08a81f74f45e3f1e54c33194a815a90867c04ca From fd8bca4d20c642877546e00f7a45fe0bf3af13a3 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 27 Dec 2021 22:35:40 +0100 Subject: [PATCH 05/89] Try Element nightly AUR search in encrypted rooms fix https://aur.archlinux.org/cgit/aur.git/commit/?h=element-desktop-nightly-bin&id=ca89fc1f025d30512c53abbe87cff61c7739c69b --- local-pkgbuild-template/schildichat-desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-pkgbuild-template/schildichat-desktop.sh b/local-pkgbuild-template/schildichat-desktop.sh index 99168a8..8e25e12 100644 --- a/local-pkgbuild-template/schildichat-desktop.sh +++ b/local-pkgbuild-template/schildichat-desktop.sh @@ -1,3 +1,3 @@ #!/bin/sh -exec "/opt/---productName---/---appName---" "$@" +LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@" From 764f0767c736fb15d6cc47079ea795dbb961c0f5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 Dec 2021 00:39:06 +0100 Subject: [PATCH 06/89] sc update announcement room toast now uses hardcoded alias --- configs/sc/config.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 3a229d0..dfc32f4 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -26,12 +26,5 @@ "url": "https://schildi.chat/desktop/privacy", "text": "Privacy Policy" } - ], - "sc_update_announcement_room": { - "room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org", - "via_servers": [ - "supercable.onl", - "spiritcroc.de" - ] - } + ] } From c27c617d145b23096392a606c10ac2528e728ee6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 Dec 2021 00:39:29 +0100 Subject: [PATCH 07/89] New test release v1.9.8-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 8de9fa8..c04da6b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 8de9fa89ce509f08d036106af7eeea672f68d764 +Subproject commit c04da6b811d9489a9d5a369104e97cb45554090f diff --git a/element-web b/element-web index d657fea..6b05e97 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d657fea221e85df3b53d95b8058c99ca70e45b7d +Subproject commit 6b05e972b06f277c845d50a6d39c282895e4d9db diff --git a/matrix-react-sdk b/matrix-react-sdk index e08a81f..7edaf5b 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit e08a81f74f45e3f1e54c33194a815a90867c04ca +Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9 From 4a52399ec2c05bd131d343e884c822b420c4a247 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 30 Dec 2021 01:20:07 +0100 Subject: [PATCH 08/89] Always run setup to get yarn links in place (again) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fbb47a2..e2f261b 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,7 @@ CSC_NAME ?= -include release.mk setup: - if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi + ./setup.sh element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*) From 3c9487541b9e3b4f385a0f16170fe4551523ecfa Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 31 Dec 2021 03:48:23 +0100 Subject: [PATCH 09/89] New release v1.9.8-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index c04da6b..15cd24d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c04da6b811d9489a9d5a369104e97cb45554090f +Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8 diff --git a/element-web b/element-web index 6b05e97..661bfae 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6b05e972b06f277c845d50a6d39c282895e4d9db +Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91 From c4e17a1bc4fe0200dcf5ba71a0a6ce2a2ed0de09 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 17 Jan 2022 21:27:44 +0100 Subject: [PATCH 10/89] Let sc.0.test.0 be the initial version after a merge --- merge_helpers.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/merge_helpers.sh b/merge_helpers.sh index 4b7aed3..3808eab 100755 --- a/merge_helpers.sh +++ b/merge_helpers.sh @@ -162,7 +162,8 @@ get_current_versions() { get_versions_string() { versions_string="${versions[0]}-sc.${versions[1]}" - if [[ ${versions[2]} -gt 0 ]]; then + # both zero means the initial version after a merge + if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then versions_string+=".test.${versions[2]}" fi } From 9d595d608743b41b3627f0a4e765f2c31f5ebec5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 26 Jan 2022 23:47:11 +0100 Subject: [PATCH 11/89] Allow react sdk theme.sh being run without commit --- merge_upstream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge_upstream.sh b/merge_upstream.sh index c3fef9c..cfbea1f 100755 --- a/merge_upstream.sh +++ b/merge_upstream.sh @@ -46,7 +46,7 @@ automatic_packagejson_adjustment # Automatic theme update pushd "matrix-react-sdk" > /dev/null -./theme.sh +./theme.sh y popd > /dev/null popd > /dev/null From 47e56badc48a0dbb431a067ccbbad22ddf22c79b Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 26 Jan 2022 23:47:55 +0100 Subject: [PATCH 12/89] New test release v1.9.9-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 15cd24d..d8cd4c9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 15cd24dfc336421f3f4ec1a1ac2d886732b302b8 +Subproject commit d8cd4c90f1305136d1050f8b6763c3df30576651 diff --git a/element-web b/element-web index 661bfae..d0ded24 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 661bfae1a8c9b4c97e6e6f7ce68a3b3d6bf65d91 +Subproject commit d0ded2417da49ea370cb458c6cd0222f22370125 diff --git a/matrix-js-sdk b/matrix-js-sdk index a71dd32..5c6b029 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit a71dd32356c5fd11000f3344370a4e25594e7f6d +Subproject commit 5c6b029158b7adbe14cf8d09c5f7473be4389ea9 diff --git a/matrix-react-sdk b/matrix-react-sdk index 7edaf5b..f3da66a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7edaf5bc5204fbf658057fd272e17e2ebeb207f9 +Subproject commit f3da66ac6aec0e726f37dc114466642e907b9cf5 From 57be42182bfd35626195ab73369194ab96f9e9ff Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 31 Jan 2022 23:19:40 +0100 Subject: [PATCH 13/89] New test release v1.10.0-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 d8cd4c9..dcfe7af 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d8cd4c90f1305136d1050f8b6763c3df30576651 +Subproject commit dcfe7af262d15296bc477748b20e115d474a437f diff --git a/element-web b/element-web index d0ded24..94802b9 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d0ded2417da49ea370cb458c6cd0222f22370125 +Subproject commit 94802b9b79dbb750f3c5c4a1478e80558dd9440f diff --git a/matrix-js-sdk b/matrix-js-sdk index 5c6b029..0e30159 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 5c6b029158b7adbe14cf8d09c5f7473be4389ea9 +Subproject commit 0e30159abcad792241ef4c46713938d2abc57490 diff --git a/matrix-react-sdk b/matrix-react-sdk index f3da66a..93424f1 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f3da66ac6aec0e726f37dc114466642e907b9cf5 +Subproject commit 93424f14ca35109c2f1f172d0a731a018a49eee4 From 867ca2ceaa470535abfebad1e8b596bd47f732e7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 31 Jan 2022 23:52:13 +0100 Subject: [PATCH 14/89] local-pkgbuild: Actually fix search in encrypted rooms --- local-pkgbuild-template/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD index df4c516..ffa8052 100644 --- a/local-pkgbuild-template/PKGBUILD +++ b/local-pkgbuild-template/PKGBUILD @@ -22,4 +22,5 @@ package() { msg2 "Extracting the data.tar.xz..." bsdtar -xf data.tar.xz -C "$pkgdir/" install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName--- + sed -i 's|^Exec=.*|Exec=/usr/bin/---appName--- %u|' "${pkgdir}"/usr/share/applications/---appName---.desktop } From 7a96f32c3f0cf5e1ab98db49f0b9d1e0db238c91 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 1 Feb 2022 19:52:34 +0100 Subject: [PATCH 15/89] New test release v1.10.1-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 dcfe7af..a64352b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dcfe7af262d15296bc477748b20e115d474a437f +Subproject commit a64352b037301ac75771ec238a1cd623fcca36a5 diff --git a/element-web b/element-web index 94802b9..f1bbaed 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 94802b9b79dbb750f3c5c4a1478e80558dd9440f +Subproject commit f1bbaedf70fd7968f1328ecd3e05cc9475d9b0dc diff --git a/matrix-react-sdk b/matrix-react-sdk index 93424f1..f750149 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 93424f14ca35109c2f1f172d0a731a018a49eee4 +Subproject commit f75014957fa461d8aef9b5a9934f3bf2e606b45d From a689c01b0e4cef10df32e89d772b5806728dece9 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Feb 2022 00:50:29 +0100 Subject: [PATCH 16/89] Add map_style_url to sc config --- configs/sc/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index dfc32f4..2916dee 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -26,5 +26,6 @@ "url": "https://schildi.chat/desktop/privacy", "text": "Privacy Policy" } - ] + ], + "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx" } From 3a8eecb023c832acc4390d3a51c0940eafb2b3bd Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Feb 2022 01:36:47 +0100 Subject: [PATCH 17/89] New test release v1.10.3-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 a64352b..27c5ba2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit a64352b037301ac75771ec238a1cd623fcca36a5 +Subproject commit 27c5ba2c9a2dcbe68dba30525871cfe39698e372 diff --git a/element-web b/element-web index f1bbaed..c60ffc6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f1bbaedf70fd7968f1328ecd3e05cc9475d9b0dc +Subproject commit c60ffc68c623854c95132525743a0cec40c96853 diff --git a/matrix-js-sdk b/matrix-js-sdk index 0e30159..252d90f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 0e30159abcad792241ef4c46713938d2abc57490 +Subproject commit 252d90f72deb33b68f6bb4526409046536bddd76 diff --git a/matrix-react-sdk b/matrix-react-sdk index f750149..24a7a40 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f75014957fa461d8aef9b5a9934f3bf2e606b45d +Subproject commit 24a7a40116b28c8a042e0bc8042dd8c1cd1bf87f From 74bb7087968309b017a89e9b86c49d18458853f7 Mon Sep 17 00:00:00 2001 From: mezysinc Date: Wed, 16 Feb 2022 20:16:15 +0000 Subject: [PATCH 18/89] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (41 of 41 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/pt_BR/ --- i18n-overlays/matrix-react-sdk/pt_BR.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/pt_BR.json b/i18n-overlays/matrix-react-sdk/pt_BR.json index c27b526..5bac536 100644 --- a/i18n-overlays/matrix-react-sdk/pt_BR.json +++ b/i18n-overlays/matrix-react-sdk/pt_BR.json @@ -37,5 +37,8 @@ "Compact: tiny avatar together with name and preview in one line": "Compacto: avatar minúsculo junto com o nome e visualização em uma linha", "Intermediate: medium sized avatar with single-line preview": "Intermédio: avatar de tamanho médio com visualização de uma linha", "Roomy: big avatar with two-line preview": "Amplo: grande avatar com visualização em duas linhas", - "Room list style": "Estilo da lista de salas" + "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" } From db1d3e4e8a2d8b32fb97ccc8984622624fff5f5c Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 26 Feb 2022 11:39:22 +0100 Subject: [PATCH 19/89] Reset AUR bin pkgrel --- deploy/update-aur-bin.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/deploy/update-aur-bin.sh b/deploy/update-aur-bin.sh index 81b999d..f5d2213 100755 --- a/deploy/update-aur-bin.sh +++ b/deploy/update-aur-bin.sh @@ -21,6 +21,7 @@ git fetch git reset --hard origin/master sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD +sed -i "s|^pkgrel=.*$|pkgrel=1|" PKGBUILD sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD makepkg --printsrcinfo > .SRCINFO From 605966fc32cd68741e81cd0de8d063ce6b34e78b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 27 Feb 2022 19:24:46 +0100 Subject: [PATCH 20/89] Revert "Try Element nightly AUR search in encrypted rooms fix" This reverts commit fd8bca4d20c642877546e00f7a45fe0bf3af13a3. --- local-pkgbuild-template/schildichat-desktop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-pkgbuild-template/schildichat-desktop.sh b/local-pkgbuild-template/schildichat-desktop.sh index 8e25e12..99168a8 100644 --- a/local-pkgbuild-template/schildichat-desktop.sh +++ b/local-pkgbuild-template/schildichat-desktop.sh @@ -1,3 +1,3 @@ #!/bin/sh -LD_PRELOAD=/usr/lib/libsqlcipher.so exec "/opt/---productName---/---appName---" "$@" +exec "/opt/---productName---/---appName---" "$@" From cf10ad78933a045a1d08b4febd0ceb96162318c4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 27 Feb 2022 19:37:37 +0100 Subject: [PATCH 21/89] Add string for YouTube embed player option --- 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 4ec4a1e..3fbe2a8 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -39,5 +39,6 @@ "Font size and typeface": "Font size and typeface", "Mark rooms as unread": "Allow marking chats as unread", "Mark as unread": "Mark as unread", - "Mark as read": "Mark as read" + "Mark as read": "Mark as read", + "Enable YouTube embed player": "Enable YouTube embed player" } From c655803783940f794e3782b371b1dbdbcf0e1199 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 27 Feb 2022 19:45:35 +0100 Subject: [PATCH 22/89] New release v1.10.4-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 27c5ba2..592337d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 27c5ba2c9a2dcbe68dba30525871cfe39698e372 +Subproject commit 592337db774fe9fd186243d3eaac1780229b459d diff --git a/element-web b/element-web index c60ffc6..f64fa1e 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit c60ffc68c623854c95132525743a0cec40c96853 +Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030 diff --git a/matrix-js-sdk b/matrix-js-sdk index 252d90f..07619ca 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 252d90f72deb33b68f6bb4526409046536bddd76 +Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a diff --git a/matrix-react-sdk b/matrix-react-sdk index 24a7a40..b616808 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 24a7a40116b28c8a042e0bc8042dd8c1cd1bf87f +Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb From 84be27839c85d02fd6a226d3471f1baae86ed7ab Mon Sep 17 00:00:00 2001 From: joshua Date: Mon, 28 Feb 2022 08:24:29 +0000 Subject: [PATCH 23/89] Translated using Weblate (Swedish) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 8990c52..94b8219 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -39,5 +39,6 @@ "Room list style": "Rumslista stil", "Mark as unread": "markera som oläst", "Mark as read": "markera som läst", - "Mark rooms as unread": "Tillåt att chattar markeras som olästa" + "Mark rooms as unread": "Tillåt att chattar markeras som olästa", + "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare" } From 7228bf7fee70a2c6cf4f47e2d8052a53ba6b1140 Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 27 Feb 2022 23:02:27 +0000 Subject: [PATCH 24/89] Translated using Weblate (Indonesian) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 1e42805..cd66942 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -39,5 +39,6 @@ "Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris", "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca", "Mark as unread": "Tandai sebagai belum dibaca", - "Mark as read": "Tandai sebagai dibaca" + "Mark as read": "Tandai sebagai dibaca", + "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat" } From 909043215f1ff684785e158f33b6273268c2d75a Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Tue, 1 Mar 2022 16:14:25 +0000 Subject: [PATCH 25/89] Translated using Weblate (Czech) Currently translated at 100.0% (42 of 42 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 f9fa215..8f37a96 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -40,5 +40,6 @@ "Hide advanced theme settings": "Skrýt pokročilá nastavení motivu", "Mark rooms as unread": "Povolit označování chatů jako nepřečtených", "Mark as unread": "Označit jako nepřečtené", - "Mark as read": "Označit jako přečtené" + "Mark as read": "Označit jako přečtené", + "Enable YouTube embed player": "Povolí vložený přehrávač YouTube" } From 768b6489816a027e664f0a44b954051a2d08d9cb Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:32:50 +0100 Subject: [PATCH 26/89] New test release v1.10.6-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 592337d..1dad2e2 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 592337db774fe9fd186243d3eaac1780229b459d +Subproject commit 1dad2e24579cb6eccae8a22442b94ce5159f0e28 diff --git a/element-web b/element-web index f64fa1e..9c949f1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030 +Subproject commit 9c949f13f26c695342c5d229c265d6081f62c1e5 diff --git a/matrix-js-sdk b/matrix-js-sdk index 07619ca..8502dd1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a +Subproject commit 8502dd1647e5058d59f68fa235ca65d0ef2dad30 diff --git a/matrix-react-sdk b/matrix-react-sdk index b616808..4387b1f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb +Subproject commit 4387b1f0f443af9e5ed664b026391a9016213914 From 602d6bcc91baafb1c53b879ad66ac814197094aa Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:36:42 +0100 Subject: [PATCH 27/89] Add string --- 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 3fbe2a8..dda71e0 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -40,5 +40,6 @@ "Mark rooms as unread": "Allow marking chats as unread", "Mark as unread": "Mark as unread", "Mark as read": "Mark as read", - "Enable YouTube embed player": "Enable YouTube embed player" + "Enable YouTube embed player": "Enable YouTube embed player", + "Collapse additional buttons": "Collapse additional buttons" } From 5a232a27db80ff8bb1a225ccf67ba902b680ac65 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Mar 2022 01:40:52 +0100 Subject: [PATCH 28/89] New test release v1.10.6-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 1dad2e2..1544670 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1dad2e24579cb6eccae8a22442b94ce5159f0e28 +Subproject commit 15446708d8bd2e5dff1a0b5c967020e8502ce533 diff --git a/element-web b/element-web index 9c949f1..9fd930c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9c949f13f26c695342c5d229c265d6081f62c1e5 +Subproject commit 9fd930c6c6161da79afb7b6e6433f8b2dbaa1532 From 40694fb207745e5780b229de967dd35f18da0816 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:34:07 +0100 Subject: [PATCH 29/89] sqlcipher now statically linked --- local-pkgbuild-template/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/local-pkgbuild-template/PKGBUILD b/local-pkgbuild-template/PKGBUILD index ffa8052..ff49e1f 100644 --- a/local-pkgbuild-template/PKGBUILD +++ b/local-pkgbuild-template/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional arch=('x86_64') url="https://schildi.chat" license=('Apache') -depends=('sqlcipher') +depends=() provides=('---appName---') conflicts=('---appName---') source=("---debName---" From d0b9a59e5923fd8db9f94755f87b0d538381dec9 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:55:58 +0100 Subject: [PATCH 30/89] Let version bump scripts add tags --- bump_release_version.sh | 1 + bump_test_version.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/bump_release_version.sh b/bump_release_version.sh index 3fc5346..a322d61 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -24,5 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New release v$versions_string" +git tag -a "v$versions_string" -m "New release v$versions_string" popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh index 979ed48..847af31 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -24,5 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New test release v$versions_string" +git tag -a "v$versions_string" -m "New test release v$versions_string" popd > /dev/null From 3957463f72c7f0d5481ea93859da2a370f146e88 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 7 Mar 2022 09:57:07 +0100 Subject: [PATCH 31/89] New test release v1.10.6-sc.0.test.3 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 1544670..f9a3d9d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 15446708d8bd2e5dff1a0b5c967020e8502ce533 +Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df diff --git a/element-web b/element-web index 9fd930c..6c6eba1 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9fd930c6c6161da79afb7b6e6433f8b2dbaa1532 +Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3 From c07881ba34ef034b1e363d000b5e6ae60f5c791b Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Sun, 6 Mar 2022 10:14:38 +0000 Subject: [PATCH 32/89] Translated using Weblate (Czech) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 8f37a96..34ebcbb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -41,5 +41,6 @@ "Mark rooms as unread": "Povolit označování chatů jako nepřečtených", "Mark as unread": "Označit jako nepřečtené", "Mark as read": "Označit jako přečtené", - "Enable YouTube embed player": "Povolí vložený přehrávač YouTube" + "Enable YouTube embed player": "Povolí vložený přehrávač YouTube", + "Collapse additional buttons": "Sbalit další tlačítka" } From dd75a20e7a9bdbc514b9d704072d12befde71eeb Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 6 Mar 2022 00:10:06 +0000 Subject: [PATCH 33/89] Translated using Weblate (German) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/ --- i18n-overlays/matrix-react-sdk/de_DE.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index e65cb3d..02c1ee5 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -141,5 +141,7 @@ "Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen", "Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren", "Mark as read": "Als gelesen markieren", - "Mark as unread": "Als ungelesen markieren" + "Mark as unread": "Als ungelesen markieren", + "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", + "Collapse additional buttons": "Zusätzliche Buttons einklappen" } From bcf9db8b8ffb7ca96000f6cd2fd8aa92e18e386c Mon Sep 17 00:00:00 2001 From: joshua Date: Sat, 5 Mar 2022 01:30:24 +0000 Subject: [PATCH 34/89] Translated using Weblate (Swedish) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 94b8219..b1616fb 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -40,5 +40,6 @@ "Mark as unread": "markera som oläst", "Mark as read": "markera som läst", "Mark rooms as unread": "Tillåt att chattar markeras som olästa", - "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare" + "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare", + "Collapse additional buttons": "Dölj ytterligare knappar" } From 79ac866bedd9a0cfc3ac14b8bfa13c6853d68d51 Mon Sep 17 00:00:00 2001 From: Linerly Date: Tue, 15 Mar 2022 22:28:51 +0000 Subject: [PATCH 35/89] Translated using Weblate (Indonesian) Currently translated at 100.0% (43 of 43 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 cd66942..210a093 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -40,5 +40,6 @@ "Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca", "Mark as unread": "Tandai sebagai belum dibaca", "Mark as read": "Tandai sebagai dibaca", - "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat" + "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat", + "Collapse additional buttons": "Sembunyikan tombol tambahan" } From 0bc5275d147ed7f833f96bdbbbd7110e7c1af097 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 17 Mar 2022 11:14:21 +0100 Subject: [PATCH 36/89] New test release v1.10.7-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 f9a3d9d..fb4e155 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df +Subproject commit fb4e155ecc661ca9e1408ffb218841ef689042e2 diff --git a/element-web b/element-web index 6c6eba1..6cabb1b 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3 +Subproject commit 6cabb1b65b4c94a8e0195458d116fa34544037ba diff --git a/matrix-js-sdk b/matrix-js-sdk index 8502dd1..8daa03b 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 8502dd1647e5058d59f68fa235ca65d0ef2dad30 +Subproject commit 8daa03be33856b030d5a53f1f91238459ef9acfa diff --git a/matrix-react-sdk b/matrix-react-sdk index 4387b1f..247bfd9 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 4387b1f0f443af9e5ed664b026391a9016213914 +Subproject commit 247bfd9fa5b5340d457ed387921c70a99f64dc14 From 1e90e778bb54ed4b44f3892eff940210634d61a7 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 1 Apr 2022 13:48:40 +0200 Subject: [PATCH 37/89] Add new string for disabling home meta space --- 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 dda71e0..8d07295 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -41,5 +41,6 @@ "Mark as unread": "Mark as unread", "Mark as read": "Mark as read", "Enable YouTube embed player": "Enable YouTube embed player", - "Collapse additional buttons": "Collapse additional buttons" + "Collapse additional buttons": "Collapse additional buttons", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms." } From a0f99d1c8652cd2d56238b2ee8f51d27a5338c0b Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 1 Apr 2022 13:50:19 +0200 Subject: [PATCH 38/89] New test release v1.10.8-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 fb4e155..c9dd12d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit fb4e155ecc661ca9e1408ffb218841ef689042e2 +Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b diff --git a/element-web b/element-web index 6cabb1b..abdb370 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 6cabb1b65b4c94a8e0195458d116fa34544037ba +Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755 diff --git a/matrix-js-sdk b/matrix-js-sdk index 8daa03b..9faf862 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 8daa03be33856b030d5a53f1f91238459ef9acfa +Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd diff --git a/matrix-react-sdk b/matrix-react-sdk index 247bfd9..0d1b0bc 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 247bfd9fa5b5340d457ed387921c70a99f64dc14 +Subproject commit 0d1b0bc5b73a2099e2a0aa2dc32b878aa2fb27cb From fe615fa0996a09a0316066cff15bc385cac9886b Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 1 Apr 2022 17:34:31 +0200 Subject: [PATCH 39/89] New test release v1.10.8-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 c9dd12d..49a4a41 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b +Subproject commit 49a4a41a1b035cc56ca3d408b3196dc8b84a2262 diff --git a/element-web b/element-web index abdb370..a92f68d 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755 +Subproject commit a92f68d167f96b8cc38360dbe4c9862289af88ff diff --git a/matrix-react-sdk b/matrix-react-sdk index 0d1b0bc..c7ea457 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0d1b0bc5b73a2099e2a0aa2dc32b878aa2fb27cb +Subproject commit c7ea457e90d0f27ee05feaaa2bcc123a69046f60 From 7b4678e91d4eb1ba7b32bea1804d8042bd93fb5e Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 16 Apr 2022 16:13:26 +0200 Subject: [PATCH 40/89] Add Debian signing key to readme --- README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/README.md b/README.md index 20b0099..12a7bb2 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,18 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we +
+Public key used to sign the Debian packages + +``` +pub rsa4096 2020-12-08 [SC] + 560BB70DA86A6633A39CEC6023358905FE294D01 +uid Super apt repo key +sub rsa4096 2020-12-08 [E] +``` + +
+ ## Building SchildiChat Web/Desktop From 3b5d16de826ef09c41de62bef88aa6517645f3f8 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Sat, 2 Apr 2022 09:37:13 +0000 Subject: [PATCH 41/89] Translated using Weblate (Czech) Currently translated at 100.0% (44 of 44 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 34ebcbb..f4e03bb 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -42,5 +42,6 @@ "Mark as unread": "Označit jako nepřečtené", "Mark as read": "Označit jako přečtené", "Enable YouTube embed player": "Povolí vložený přehrávač YouTube", - "Collapse additional buttons": "Sbalit další tlačítka" + "Collapse additional buttons": "Sbalit další tlačítka", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti." } From a20f05c933e31ff69a13c3ae34818242612ac870 Mon Sep 17 00:00:00 2001 From: Linerly Date: Wed, 6 Apr 2022 12:09:35 +0000 Subject: [PATCH 42/89] Translated using Weblate (Indonesian) Currently translated at 100.0% (44 of 44 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/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 210a093..a986a4d 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -41,5 +41,6 @@ "Mark as unread": "Tandai sebagai belum dibaca", "Mark as read": "Tandai sebagai dibaca", "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat", - "Collapse additional buttons": "Sembunyikan tombol tambahan" + "Collapse additional buttons": "Sembunyikan tombol tambahan", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan." } From ad2fc85f24d4ad350dec9512b3aaf6efa25f1d81 Mon Sep 17 00:00:00 2001 From: joshua Date: Mon, 11 Apr 2022 11:51:56 +0000 Subject: [PATCH 43/89] Translated using Weblate (Swedish) Currently translated at 100.0% (44 of 44 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index b1616fb..7282f7f 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -41,5 +41,6 @@ "Mark as read": "markera som läst", "Mark rooms as unread": "Tillåt att chattar markeras som olästa", "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare", - "Collapse additional buttons": "Dölj ytterligare knappar" + "Collapse additional buttons": "Dölj ytterligare knappar", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum." } From 3d67db61b62fd0f71446b7e242db2240f4e0bfaf Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 16 Apr 2022 21:22:52 +0200 Subject: [PATCH 44/89] Use signed tags --- bump_release_version.sh | 2 +- bump_test_version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bump_release_version.sh b/bump_release_version.sh index a322d61..92b5cac 100755 --- a/bump_release_version.sh +++ b/bump_release_version.sh @@ -24,6 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New release v$versions_string" -git tag -a "v$versions_string" -m "New release v$versions_string" +git tag -s "v$versions_string" -m "New release v$versions_string" popd > /dev/null diff --git a/bump_test_version.sh b/bump_test_version.sh index 847af31..bffb851 100755 --- a/bump_test_version.sh +++ b/bump_test_version.sh @@ -24,6 +24,6 @@ get_versions_string # Add everything git add -A git commit --allow-empty -m "New test release v$versions_string" -git tag -a "v$versions_string" -m "New test release v$versions_string" +git tag -s "v$versions_string" -m "New test release v$versions_string" popd > /dev/null From 58e2f34b6332b7b11438191bea32e82924f0a0bc Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 16 Apr 2022 21:36:14 +0200 Subject: [PATCH 45/89] New test release v1.10.10-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 49a4a41..0ee1a2a 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 49a4a41a1b035cc56ca3d408b3196dc8b84a2262 +Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8 diff --git a/element-web b/element-web index a92f68d..b4f26a6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a92f68d167f96b8cc38360dbe4c9862289af88ff +Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289 diff --git a/matrix-js-sdk b/matrix-js-sdk index 9faf862..e82be9f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd +Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5 diff --git a/matrix-react-sdk b/matrix-react-sdk index c7ea457..cea7c0e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c7ea457e90d0f27ee05feaaa2bcc123a69046f60 +Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74 From 982c2ac09bae4d1e73fac8ba807c1dcd1d603a84 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 30 Apr 2022 11:58:48 +0200 Subject: [PATCH 46/89] New test release v1.10.10-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 0ee1a2a..f118f8f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8 +Subproject commit f118f8fbd3d5caf98ced8fe709649ecb65b5e2e0 diff --git a/element-web b/element-web index b4f26a6..164d8e9 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289 +Subproject commit 164d8e9643b22ddd1925177a7df475b599e062c3 diff --git a/matrix-react-sdk b/matrix-react-sdk index cea7c0e..2b81c48 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74 +Subproject commit 2b81c48ed650d011c84d4f6fa6e5b325cb4c690f From 3b2da6b386c6c1ff7cb51fab8981a507eeb74103 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 30 Apr 2022 11:59:31 +0200 Subject: [PATCH 47/89] New test release v1.10.10-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 f118f8f..2fac82b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit f118f8fbd3d5caf98ced8fe709649ecb65b5e2e0 +Subproject commit 2fac82bd009bf520bb0abdabaea1721a266f52ce diff --git a/element-web b/element-web index 164d8e9..8394c41 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 164d8e9643b22ddd1925177a7df475b599e062c3 +Subproject commit 8394c417728e728ff641a1691e5c4bc40d13f866 diff --git a/matrix-react-sdk b/matrix-react-sdk index 2b81c48..1f9e6c8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2b81c48ed650d011c84d4f6fa6e5b325cb4c690f +Subproject commit 1f9e6c81fbc183ced62f8567babafe4d42b1660d From 72166a9a90dc4c865bcf028e864734c40c75e77a Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 30 Apr 2022 13:48:37 +0200 Subject: [PATCH 48/89] Remove reskindex --- Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e2f261b..5a897e6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: all setup regenerate-i18n reskindex web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable +.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: clean @@ -60,12 +60,8 @@ icns: element-desktop/build/icon.icns element-desktop/build/dmg.icns regenerate-i18n: setup ./regenerate_i18n.sh -reskindex: setup - $(YARN) --cwd matrix-react-sdk reskindex - $(YARN) --cwd element-web reskindex - web: export DIST_VERSION=$(WEB_OUT_DIST_VERSION) -web: setup reskindex +web: setup cp $(CFGDIR)/config.json element-web/ $(YARN) --cwd element-web dist echo "$(VERSION)" > element-web/webapp/version From 921f3c5a0ad331998fd379234cce1c16d0ff48c6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 30 Apr 2022 13:52:59 +0200 Subject: [PATCH 49/89] New test release v1.10.11-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 2fac82b..e8271ec 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 2fac82bd009bf520bb0abdabaea1721a266f52ce +Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9 diff --git a/element-web b/element-web index 8394c41..f87ee44 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8394c417728e728ff641a1691e5c4bc40d13f866 +Subproject commit f87ee443e4be1d496a6034137660f53e6778d918 diff --git a/matrix-js-sdk b/matrix-js-sdk index e82be9f..c696abf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5 +Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2 diff --git a/matrix-react-sdk b/matrix-react-sdk index 1f9e6c8..8245acd 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1f9e6c81fbc183ced62f8567babafe4d42b1660d +Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb From dbda42b528b3a3a8d09fc58c71a22cacae10f318 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 1 May 2022 19:14:00 +0200 Subject: [PATCH 50/89] New test release v1.10.11-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 e8271ec..64d9fad 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9 +Subproject commit 64d9fadbbeae8e109d237d185e2c865a63004a83 diff --git a/element-web b/element-web index f87ee44..9bd6ec3 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f87ee443e4be1d496a6034137660f53e6778d918 +Subproject commit 9bd6ec343318a5056bcc4becfdc738d5727a277d diff --git a/matrix-react-sdk b/matrix-react-sdk index 8245acd..c1a2770 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb +Subproject commit c1a277047410e74ae24d3737fe514c7579f98878 From 7b8af07aef4f15da1b56504dbe926d5f60839822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lynn=20Nakanishi=20Lin=EF=BC=88=E6=9E=97=E4=B8=AD=E8=A5=BF?= =?UTF-8?q?=EF=BC=89?= Date: Wed, 4 May 2022 02:04:52 +0000 Subject: [PATCH 51/89] Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (44 of 44 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/zh_Hans/ --- i18n-overlays/matrix-react-sdk/zh_Hans.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index 6702566..aef112a 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/i18n-overlays/matrix-react-sdk/zh_Hans.json @@ -39,5 +39,8 @@ "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).": "您想加入一个用来通知版本更新的房间吗？如果您的平台不支持自动更新 SchildiChat（例如 Windows 和 macOS），这将非常有用。", "Mark as read": "标记为已读", "Mark rooms as unread": "允许将聊天记录标记为未读", - "Mark as unread": "标记为未读" + "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": "折叠额外的按钮" } From b110f126557ebb5e292b70a37c37653fee81bdcd Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 9 May 2022 09:37:17 +0200 Subject: [PATCH 52/89] New test release v1.10.11-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 64d9fad..aea9cef 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 64d9fadbbeae8e109d237d185e2c865a63004a83 +Subproject commit aea9cefa5d59930a831e94104521b70619d6623b diff --git a/element-web b/element-web index 9bd6ec3..416913d 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 9bd6ec343318a5056bcc4becfdc738d5727a277d +Subproject commit 416913d12060244672c86cc175b6fbbcbfaf759b diff --git a/matrix-react-sdk b/matrix-react-sdk index c1a2770..cdc59f3 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c1a277047410e74ae24d3737fe514c7579f98878 +Subproject commit cdc59f3df4d67c36a79c0872499713c256ba068d From b6ed8d444bd20e206926a011daf1e010770dd545 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 9 May 2022 09:42:44 +0200 Subject: [PATCH 53/89] New test release v1.10.11-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 aea9cef..31adfcd 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit aea9cefa5d59930a831e94104521b70619d6623b +Subproject commit 31adfcd7d1f68a4a4dc53f50743d934faaedda2f diff --git a/element-web b/element-web index 416913d..0fcbaa3 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 416913d12060244672c86cc175b6fbbcbfaf759b +Subproject commit 0fcbaa3e19c20e73fe85146985830c8f807b0fe0 diff --git a/matrix-react-sdk b/matrix-react-sdk index cdc59f3..c18ac52 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit cdc59f3df4d67c36a79c0872499713c256ba068d +Subproject commit c18ac5217f24f910a86063519fcda5d005af8e35 From 01506eb519c211a3b740e5f24368059bc712e5f6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 11 May 2022 01:56:07 +0200 Subject: [PATCH 54/89] New test release v1.10.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 31adfcd..6ca4d90 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 31adfcd7d1f68a4a4dc53f50743d934faaedda2f +Subproject commit 6ca4d9024f8b761f850415f92fb3b5f2302c3c50 diff --git a/element-web b/element-web index 0fcbaa3..10daba3 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 0fcbaa3e19c20e73fe85146985830c8f807b0fe0 +Subproject commit 10daba321703efac427421ee1331cea42aed2b70 diff --git a/matrix-js-sdk b/matrix-js-sdk index c696abf..a7e6126 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2 +Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8 diff --git a/matrix-react-sdk b/matrix-react-sdk index c18ac52..93096bd 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c18ac5217f24f910a86063519fcda5d005af8e35 +Subproject commit 93096bdad64c9136bacfd6dae5b93939cb05afc4 From 74127c8d7be37b90a6839eb64c5508737a50a821 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 13 May 2022 23:01:59 +0200 Subject: [PATCH 55/89] New release v1.10.12-sc.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 6ca4d90..686a02c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6ca4d9024f8b761f850415f92fb3b5f2302c3c50 +Subproject commit 686a02cc404525713d1815b9662b19d83e637c85 diff --git a/element-web b/element-web index 10daba3..863bae4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 10daba321703efac427421ee1331cea42aed2b70 +Subproject commit 863bae40dd9bd5a70818269b13e28009b549a7a3 diff --git a/matrix-react-sdk b/matrix-react-sdk index 93096bd..7038265 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 93096bdad64c9136bacfd6dae5b93939cb05afc4 +Subproject commit 7038265fa5357e89d562f96d14d37b497fad10dc From 3d5935fc271ccc99641bab54fbb28e3fe226d5f0 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 14 May 2022 00:26:14 +0200 Subject: [PATCH 56/89] Add some Debian build dependencies --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 12a7bb2..5526d5a 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ some dependencies might not be recent enough to build SchildiChat. The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye): ``` -# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools +# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools openssl libssl-dev tcl # curl -sL https://deb.nodesource.com/setup_14.x | bash - # apt update From dffc2ad920062a2ef241a7ee5b3fde5d77fb4bc4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 28 May 2022 14:24:00 +0200 Subject: [PATCH 57/89] Preemptively add static sqlcipher flag See: https://github.com/vector-im/element-desktop/blob/develop/docs/native-node-modules.md#statically-linking-libsqlcipher --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 5a897e6..e099073 100644 --- a/Makefile +++ b/Makefile @@ -67,6 +67,7 @@ web: setup echo "$(VERSION)" > element-web/webapp/version desktop-common: web + export SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run fetch --cfgdir '' $(YARN) --cwd element-desktop run build:native From a8d635c26fe6272286292ac8ed721473076a0260 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 28 May 2022 15:22:24 +0200 Subject: [PATCH 58/89] New test release v1.10.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 686a02c..9a01920 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 686a02cc404525713d1815b9662b19d83e637c85 +Subproject commit 9a0192067b4003f063806bb524930b0650524a97 diff --git a/element-web b/element-web index 863bae4..89ae492 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 863bae40dd9bd5a70818269b13e28009b549a7a3 +Subproject commit 89ae4928129936ce7ba96675e7c5cac07dae19d5 diff --git a/matrix-js-sdk b/matrix-js-sdk index a7e6126..4a5ee08 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8 +Subproject commit 4a5ee08063d1e48aa707a2898675168cc3c176db diff --git a/matrix-react-sdk b/matrix-react-sdk index 7038265..255e618 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 7038265fa5357e89d562f96d14d37b497fad10dc +Subproject commit 255e6180a278d336373fafcec1cc409453bc070e From 7010bc8eef7565163d030485bf7c5ae4325d356a Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 30 May 2022 17:41:41 +0200 Subject: [PATCH 59/89] New test release v1.10.13-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 9a01920..31b2394 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 9a0192067b4003f063806bb524930b0650524a97 +Subproject commit 31b23944dc6f2ae9dee02ad9c91c1d2ada75472d diff --git a/element-web b/element-web index 89ae492..4ab85f7 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 89ae4928129936ce7ba96675e7c5cac07dae19d5 +Subproject commit 4ab85f7cfb4570477a63d0c217d723ff73539fc5 diff --git a/matrix-react-sdk b/matrix-react-sdk index 255e618..8fd244e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 255e6180a278d336373fafcec1cc409453bc070e +Subproject commit 8fd244ea3c20c3dc665e21eb1f6e6ede57c80ff7 From 67d0129df1ad3c89ec15eab3e85b21792dc113d4 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 3 Jun 2022 10:22:16 +0200 Subject: [PATCH 60/89] Update feature list --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5526d5a..f4d437d 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,10 @@ SchildiChat Web/Desktop is a fork of Element [Web](https://github.com/vector-im/element-web)/[Desktop](https://github.com/vector-im/element-desktop). The most important changes of SchildiChat Web/Desktop compared to Element Web/Desktop are: -- A unified chat list for both direct and group chats +- Customizable room list style (compact single line, intermediate and roomy with two line preview) +- Option to show direct and group chats in a combined list +- Improved theming options - Message bubbles -- Bigger items in the room list - … and more! Desktop downloads with installation instructions are listed on our website: [https://schildi.chat/desktop](https://schildi.chat/desktop) From 0d28fedcd1fd2aaaf96f2de1518c5c4d0afb3aee Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 4 Jun 2022 19:14:31 +0200 Subject: [PATCH 61/89] New test release v1.10.13-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 31b2394..1074a79 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 31b23944dc6f2ae9dee02ad9c91c1d2ada75472d +Subproject commit 1074a795151c79973047620e1bfe45be8ecd515a diff --git a/element-web b/element-web index 4ab85f7..0553052 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 4ab85f7cfb4570477a63d0c217d723ff73539fc5 +Subproject commit 0553052c1242ffdfee11ceafcfe991db875a1596 diff --git a/matrix-react-sdk b/matrix-react-sdk index 8fd244e..18c8079 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 8fd244ea3c20c3dc665e21eb1f6e6ede57c80ff7 +Subproject commit 18c807969e48bfb442b76029bfdb8d501602071f From 50e2b95737e03de917a12592686e75d0ebdc5d8c Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 7 Jun 2022 16:49:40 +0200 Subject: [PATCH 62/89] New test release v1.10.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 1074a79..13b4cb7 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1074a795151c79973047620e1bfe45be8ecd515a +Subproject commit 13b4cb7e3d51fd626d35a8cdb16f31894c19a20b diff --git a/element-web b/element-web index 0553052..2eaaf0f 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 0553052c1242ffdfee11ceafcfe991db875a1596 +Subproject commit 2eaaf0f577ba9fc9ec8c5b38b10f38cf82195df0 diff --git a/matrix-js-sdk b/matrix-js-sdk index 4a5ee08..ee15b18 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 4a5ee08063d1e48aa707a2898675168cc3c176db +Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f diff --git a/matrix-react-sdk b/matrix-react-sdk index 18c8079..8d9129f 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 18c807969e48bfb442b76029bfdb8d501602071f +Subproject commit 8d9129f329ce137bd519f7116bfdf693d74a1609 From b7dfafa250451ef9721ec2b89f0518913c16b451 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 9 Jun 2022 19:16:41 +0200 Subject: [PATCH 63/89] sqlciper whyever ... --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e099073..95fd274 100644 --- a/Makefile +++ b/Makefile @@ -67,9 +67,8 @@ web: setup echo "$(VERSION)" > element-web/webapp/version desktop-common: web - export SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run fetch --cfgdir '' - $(YARN) --cwd element-desktop run build:native + SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native macos-common: web icns $(YARN) --cwd element-desktop run fetch --cfgdir '' From 4349e1116eb468c31a517ce6907cd9a8287d1eea Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 16 Jun 2022 18:43:13 +0200 Subject: [PATCH 64/89] New test release v1.10.15-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 13b4cb7..1d3a14d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 13b4cb7e3d51fd626d35a8cdb16f31894c19a20b +Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b diff --git a/element-web b/element-web index 2eaaf0f..11fedf6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2eaaf0f577ba9fc9ec8c5b38b10f38cf82195df0 +Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a diff --git a/matrix-react-sdk b/matrix-react-sdk index 8d9129f..f167688 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 8d9129f329ce137bd519f7116bfdf693d74a1609 +Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef From 0595d1d0994d5dcb6585c2149cb2f9deb8f429d5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 18 Jun 2022 19:23:39 +0200 Subject: [PATCH 65/89] Add new border radius strings --- i18n-overlays/matrix-react-sdk/en_EN.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index 8d07295..e45eaab 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -42,5 +42,9 @@ "Mark as read": "Mark as read", "Enable YouTube embed player": "Enable YouTube embed player", "Collapse additional buttons": "Collapse additional buttons", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.", + "Corners": "Corners", + "Round": "Round", + "Extra round": "Extra round", + "Mixed": "Mixed" } From 2a4d537607663bb31e0f559798bb52a497ca44fc Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 18 Jun 2022 17:26:23 +0000 Subject: [PATCH 66/89] Translated using Weblate (German) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/ --- i18n-overlays/matrix-react-sdk/de_DE.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index 02c1ee5..3bb30e2 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -143,5 +143,10 @@ "Mark as read": "Als gelesen markieren", "Mark as unread": "Als ungelesen markieren", "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", - "Collapse additional buttons": "Zusätzliche Buttons einklappen" + "Collapse additional buttons": "Zusätzliche Buttons einklappen", + "Round": "Rund", + "Mixed": "Gemischt", + "Corners": "Ecken", + "Extra round": "Extra rund", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst." } From 714ea6d9e49534ff817f8a8c421bdfaf4635d4c3 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 18 Jun 2022 19:41:42 +0200 Subject: [PATCH 67/89] New test release v1.10.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 1d3a14d..5fb3c3f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b +Subproject commit 5fb3c3f8f21de8d82c76c76b56a8dd024b5e213d diff --git a/element-web b/element-web index 11fedf6..3e1e6f8 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a +Subproject commit 3e1e6f8413a452e77a41ddbb4bdd453fa8bd209f diff --git a/matrix-react-sdk b/matrix-react-sdk index f167688..5b96624 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef +Subproject commit 5b9662482613e3e74b49d7d8fa7684cda3dd839e From 6aaa75d991ecc68f004aa93cae30bfa81b009a18 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Mon, 20 Jun 2022 06:27:28 +0000 Subject: [PATCH 68/89] Translated using Weblate (Czech) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index f4e03bb..a8b9501 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -43,5 +43,9 @@ "Mark as read": "Označit jako přečtené", "Enable YouTube embed player": "Povolí vložený přehrávač YouTube", "Collapse additional buttons": "Sbalit další tlačítka", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Úvod je užitečný pro získání přehledu o všem. Mějte na paměti, že její vypnutí může způsobit, že nebudete moci zobrazit některé místnosti.", + "Corners": "Rohy", + "Round": "Oblé", + "Extra round": "Kulaté", + "Mixed": "Smíšené" } From 4650aa2ec15aaab224249afdceb7697d1d08e624 Mon Sep 17 00:00:00 2001 From: joshua Date: Sun, 19 Jun 2022 18:19:48 +0000 Subject: [PATCH 69/89] Translated using Weblate (Swedish) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 7282f7f..284a43a 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -42,5 +42,9 @@ "Mark rooms as unread": "Tillåt att chattar markeras som olästa", "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare", "Collapse additional buttons": "Dölj ytterligare knappar", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home är användbart för att få en överblick över allt. Tänk på att om du inaktiverar den kan du inte se vissa rum.", + "Round": "Runda", + "Extra round": "Extrarunda", + "Mixed": "Blandad", + "Corners": "Hörn" } From cddd80ae2ad313699290a9fbac2e0f720510f69e Mon Sep 17 00:00:00 2001 From: Linerly Date: Sun, 19 Jun 2022 17:21:55 +0000 Subject: [PATCH 70/89] Translated using Weblate (Indonesian) Currently translated at 100.0% (48 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index a986a4d..0b8d8a5 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -42,5 +42,9 @@ "Mark as read": "Tandai sebagai dibaca", "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat", "Collapse additional buttons": "Sembunyikan tombol tambahan", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Beranda berguna untuk mendapatkan ikhtisar segalanya. Menonaktifkan Beranda mungkin dapat membuat Anda tidak dapat melihat beberapa ruangan.", + "Corners": "Sudut", + "Round": "Bulat", + "Extra round": "Ekstra bulat", + "Mixed": "Campur" } From 89e4c0444e12a8b57ccbc1694285e8a9986f76f7 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 22 Jun 2022 09:02:54 +0200 Subject: [PATCH 71/89] Added translation using Weblate (Turkish) --- i18n-overlays/element-web/tr.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-web/tr.json diff --git a/i18n-overlays/element-web/tr.json b/i18n-overlays/element-web/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-web/tr.json @@ -0,0 +1 @@ +{} From 8d2e87e3ff37c70c203ba7ee18455663cf9a213b Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 22 Jun 2022 09:02:56 +0200 Subject: [PATCH 72/89] Added translation using Weblate (Turkish) --- i18n-overlays/element-desktop/tr.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-desktop/tr.json diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-desktop/tr.json @@ -0,0 +1 @@ +{} From 4d6909368bb908b50efc9f200c73d90efc8a42b8 Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 22 Jun 2022 09:02:59 +0200 Subject: [PATCH 73/89] Added translation using Weblate (Turkish) --- i18n-overlays/matrix-react-sdk/tr.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/matrix-react-sdk/tr.json diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -0,0 +1 @@ +{} From e0ee5eaaefdd3554833c433d4f9b756f4da8dd61 Mon Sep 17 00:00:00 2001 From: metezd Date: Thu, 23 Jun 2022 07:25:08 +0000 Subject: [PATCH 74/89] Translated using Weblate (Turkish) Currently translated at 100.0% (1 of 1 strings) Translation: SchildiChat/element-desktop Translate-URL: https://weblate.bubu1.eu/projects/schildichat/element-desktop/tr/ --- i18n-overlays/element-desktop/tr.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/element-desktop/tr.json b/i18n-overlays/element-desktop/tr.json index 0967ef4..f1a952b 100644 --- a/i18n-overlays/element-desktop/tr.json +++ b/i18n-overlays/element-desktop/tr.json @@ -1 +1,3 @@ -{} +{ + "Show": "Göster" +} From 01895fc35c884cebb6c9a32812ada84966c547bf Mon Sep 17 00:00:00 2001 From: metezd Date: Fri, 24 Jun 2022 15:07:24 +0000 Subject: [PATCH 75/89] Translated using Weblate (Turkish) Currently translated at 39.5% (19 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/tr/ --- i18n-overlays/matrix-react-sdk/tr.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json index 0967ef4..924de5a 100644 --- a/i18n-overlays/matrix-react-sdk/tr.json +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -1 +1,21 @@ -{} +{ + "Show message bubbles on one side only": "Mesaj baloncuklarını yalnızca bir tarafta göster", + "Show message bubbles depending on the width either on both sides or only on one side": "Genişliğe bağlı olarak mesaj baloncuklarını her iki tarafta veya sadece bir tarafta göster", + "Message bubbles": "Mesaj baloncukları", + "Normal priority": "Normal öncelik", + "Message layout": "Mesaj düzeni", + "Modern": "Modern", + "Update notifications": "Güncelleme bildirimleri", + "Don't ask again": "Bir daha sorma", + "System": "Sistem", + "Add custom theme": "Özel tema ekle", + "Theme in use": "Tema kullanımda", + "Light theme": "Açık tema", + "Dark theme": "Koyu tema", + "Uniform": "Düzenli", + "For people": "İnsanlar için", + "In group chats": "Grup sohbetlerinde", + "In public rooms": "Halka açık odalarda", + "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster", + "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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır." +} From a89a4bc9e0d6785d459bdb89008d6112cfd3b25b Mon Sep 17 00:00:00 2001 From: metezd Date: Tue, 28 Jun 2022 12:02:26 +0000 Subject: [PATCH 76/89] Translated using Weblate (Turkish) Currently translated at 95.8% (46 of 48 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/tr/ --- i18n-overlays/matrix-react-sdk/tr.json | 29 +++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/tr.json b/i18n-overlays/matrix-react-sdk/tr.json index 924de5a..0856dee 100644 --- a/i18n-overlays/matrix-react-sdk/tr.json +++ b/i18n-overlays/matrix-react-sdk/tr.json @@ -17,5 +17,32 @@ "In group chats": "Grup sohbetlerinde", "In public rooms": "Halka açık odalarda", "Show people and rooms in a combined list": "Kişileri ve odaları birleşik bir listede göster", - "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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır." + "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).": "Yeni sürümler hakkında sizi bilgilendiren bir odaya katılmak ister misiniz? Bu oda özellikle platformunuz SchildiChat için otomatik güncellemeleri desteklemiyorsa (ör. Windows ve macOS) kullanışlıdır.", + "If disabled, the space overview will be shown when switching to another space.": "Devre dışı bırakılırsa, başka bir alana geçerken alana ilişkin genel görünüm gösterilir.", + "Mark as unread": "Okunmadı olarak işaretle", + "User name color mode": "Kullanıcı adı renk modu", + "Show people in spaces": "İnsanları alanlarda göster", + "If disabled, you can still add Direct Messages to Personal Spaces. If enabled, you'll automatically see everyone who is a member of the Space.": "Devre dışı bırakılmışsa, kişisel alanlara direkt mesajlar eklemeye devam edebilirsiniz. Etkinleştirilirse, alana üye olan herkesi otomatik olarak görürsünüz.", + "Show notification badges for People in Spaces": "Alanlardaki Kişiler için bildirim rozetlerini göster", + "Return to the room previously opened in a space": "Bir alanda daha önce açılmış olan odaya geri dön", + "Compact: tiny avatar together with name and preview in one line": "Sıkıştırılmış: tek satırda isim ve önizleme ile birlikte küçük avatar", + "Intermediate: medium sized avatar with single-line preview": "Orta: tek satır önizlemeli orta boy avatar", + "Roomy: big avatar with two-line preview": "Ferah: iki satırlık önizleme ile büyük avatar", + "Room list style": "Oda listesi tarzı", + "Hide advanced theme settings": "Gelişmiş tema ayarlarını gizle", + "Show all rooms in Home": "Ana sayfadaki tüm odaları göster", + "All rooms you're in will appear in Home.": "Bulunduğunuz tüm odalar ana sayfada görünecektir.", + "Show advanced theme settings": "Gelişmiş tema ayarlarını göster", + "Theme": "Tema", + "Font size and typeface": "Yazı tipi boyutu ve yazı karakteri", + "Room list": "Oda sıralaması", + "Mark rooms as unread": "Sohbetleri okunmamış olarak işaretlemeye izin ver", + "Mark as read": "Okundu olarak işaretle", + "Enable YouTube embed player": "YouTube gömülü oynatıcıyı etkinleştir", + "Collapse additional buttons": "Ek düğmeleri daralt", + "Corners": "Köşeler", + "Round": "Yuvarlak", + "Extra round": "Fazladan yuvarlak", + "Mixed": "Karışık", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Ana sayfa, her şeye genel bir bakış elde etmek için kullanışlıdır. Devre dışı bırakıldığında belirli odaları göremeyebileceğinizi unutmayın." } From c9333c24d5753c86f79c6e10c32b1fab332df324 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 7 Jul 2022 19:01:48 +0200 Subject: [PATCH 77/89] New test release v1.11.0-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 5fb3c3f..ce23be0 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 5fb3c3f8f21de8d82c76c76b56a8dd024b5e213d +Subproject commit ce23be00b4d891f8fb9c53f0d1f329b0d9542205 diff --git a/element-web b/element-web index 3e1e6f8..bfbc1ab 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 3e1e6f8413a452e77a41ddbb4bdd453fa8bd209f +Subproject commit bfbc1ab415c33979d4c72a0dc365630c1f6e43d8 diff --git a/matrix-js-sdk b/matrix-js-sdk index ee15b18..2a6db46 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f +Subproject commit 2a6db46dbe0ecbd79a71d5bffdf984e9807a8cbb diff --git a/matrix-react-sdk b/matrix-react-sdk index 5b96624..47fd53c 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 5b9662482613e3e74b49d7d8fa7684cda3dd839e +Subproject commit 47fd53c867e0ee572d8e9a5ed0b9f912b0cdc005 From c8df36cfc693a04196ee5b8651ad83662c00d1e3 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 14 Jul 2022 12:02:48 +0200 Subject: [PATCH 78/89] Add new strings for sound pack --- i18n-overlays/matrix-react-sdk/en_EN.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json index e45eaab..7732df7 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -46,5 +46,8 @@ "Corners": "Corners", "Round": "Round", "Extra round": "Extra round", - "Mixed": "Mixed" + "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" } From 8dfcd78f0103dc935c5b4c27fdfcf8e20870c652 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 14 Jul 2022 12:03:01 +0200 Subject: [PATCH 79/89] New test release v1.11.0-sc.0.test.2 --- 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 ce23be0..b0bfb5c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ce23be00b4d891f8fb9c53f0d1f329b0d9542205 +Subproject commit b0bfb5c2d37288edd7b814fc7ac97a96622a00fc diff --git a/element-web b/element-web index bfbc1ab..d9f6146 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit bfbc1ab415c33979d4c72a0dc365630c1f6e43d8 +Subproject commit d9f614624be0600c8c308b526577864087e95d97 diff --git a/matrix-js-sdk b/matrix-js-sdk index 2a6db46..dd3932f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 2a6db46dbe0ecbd79a71d5bffdf984e9807a8cbb +Subproject commit dd3932fcb705f445e8368855b27db95eb1f173b6 diff --git a/matrix-react-sdk b/matrix-react-sdk index 47fd53c..71fe48a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 47fd53c867e0ee572d8e9a5ed0b9f912b0cdc005 +Subproject commit 71fe48a9cea7b2c73e0b778aa8ed594e6755b4f8 From a96278bc44479126f77895a6a3480a5ee7903325 Mon Sep 17 00:00:00 2001 From: waclaw66 Date: Thu, 14 Jul 2022 18:34:45 +0000 Subject: [PATCH 80/89] Translated using Weblate (Czech) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/cs/ --- i18n-overlays/matrix-react-sdk/cs.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json index a8b9501..861e944 100644 --- a/i18n-overlays/matrix-react-sdk/cs.json +++ b/i18n-overlays/matrix-react-sdk/cs.json @@ -47,5 +47,8 @@ "Corners": "Rohy", "Round": "Oblé", "Extra round": "Kulaté", - "Mixed": "Smíšené" + "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" } From 97d058da1bc100d302597e4768434e78cf6dbee0 Mon Sep 17 00:00:00 2001 From: joshua Date: Fri, 15 Jul 2022 23:13:41 +0000 Subject: [PATCH 81/89] Translated using Weblate (Swedish) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/sv/ --- i18n-overlays/matrix-react-sdk/sv.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json index 284a43a..9facd06 100644 --- a/i18n-overlays/matrix-react-sdk/sv.json +++ b/i18n-overlays/matrix-react-sdk/sv.json @@ -46,5 +46,8 @@ "Round": "Runda", "Extra round": "Extrarunda", "Mixed": "Blandad", - "Corners": "Hörn" + "Corners": "Hörn", + "Sound pack": "Ljudpaket", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Mjukare ljud för minskad ångest", + "Classic: The same sharp sounds as Element": "Klassisk: Samma skarpa ljud som Element" } From 0f691d4dc674b980cca2276adea505f3a6143db7 Mon Sep 17 00:00:00 2001 From: Linerly Date: Fri, 15 Jul 2022 12:15:22 +0000 Subject: [PATCH 82/89] Translated using Weblate (Indonesian) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/id/ --- i18n-overlays/matrix-react-sdk/id.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json index 0b8d8a5..c0d5cbb 100644 --- a/i18n-overlays/matrix-react-sdk/id.json +++ b/i18n-overlays/matrix-react-sdk/id.json @@ -46,5 +46,8 @@ "Corners": "Sudut", "Round": "Bulat", "Extra round": "Ekstra bulat", - "Mixed": "Campur" + "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" } From 5ce4f71da299ebccb271ac8cecb77d5e6de9b5c0 Mon Sep 17 00:00:00 2001 From: pixelcode Date: Thu, 28 Jul 2022 09:04:02 +0000 Subject: [PATCH 83/89] Translated using Weblate (German) Currently translated at 100.0% (51 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/de/ --- i18n-overlays/matrix-react-sdk/de_DE.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index 3bb30e2..d7d2ed2 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -148,5 +148,8 @@ "Mixed": "Gemischt", "Corners": "Ecken", "Extra round": "Extra rund", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst." + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst.", + "Classic: The same sharp sounds as Element": "Klassisch: Die gleichen scharfen Geräusche wie in Element", + "Sound pack": "Geräuschpaket", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Sanftere Klänge für weniger Angstgefühle" } From 2bccbdbe575e3615324816b4988ed9517e89626d Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 1 Aug 2022 11:57:31 +0200 Subject: [PATCH 84/89] New test release v1.11.1-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 b0bfb5c..ba6b8bf 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit b0bfb5c2d37288edd7b814fc7ac97a96622a00fc +Subproject commit ba6b8bf283a92c3f80539eab5b1c62e396b6e93e diff --git a/element-web b/element-web index d9f6146..1203f15 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d9f614624be0600c8c308b526577864087e95d97 +Subproject commit 1203f1530d67863a4cb27d25851d46eecebf5685 diff --git a/matrix-js-sdk b/matrix-js-sdk index dd3932f..d0951b8 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit dd3932fcb705f445e8368855b27db95eb1f173b6 +Subproject commit d0951b83471f5fcabdfe14b5df497dc54acbeda4 diff --git a/matrix-react-sdk b/matrix-react-sdk index 71fe48a..f05b786 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 71fe48a9cea7b2c73e0b778aa8ed594e6755b4f8 +Subproject commit f05b786171f1d6997076a59764f359ed5d0fdc27 From 3757d1d7d694371cff9da429301793b7b82402fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Wed, 3 Aug 2022 01:59:23 +0000 Subject: [PATCH 85/89] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?= =?UTF-8?q?=20Bokm=C3=A5l)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently translated at 66.6% (34 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/nb_NO/ --- i18n-overlays/matrix-react-sdk/nb_NO.json | 26 ++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/nb_NO.json b/i18n-overlays/matrix-react-sdk/nb_NO.json index cd11a91..e3eb1c6 100644 --- a/i18n-overlays/matrix-react-sdk/nb_NO.json +++ b/i18n-overlays/matrix-react-sdk/nb_NO.json @@ -8,5 +8,29 @@ "Show message bubbles on one side only": "Vis meldingsbobler kun på én side", "Show message bubbles depending on the width either on both sides or only on one side": "Vis meldingsbobler avhengig av bredden enten på begge sider eller kun på én side", "Don't ask again": "Ikke spør igjen", - "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).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og 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).": "Ønsker du at et rom skal gi deg merknader om nye utgivelser? Dette er spesielt nyttig hvis din plattform ikke støtter automatiske oppdateringer for SchildiChat (f.eks. Windows og macOS).", + "Hide advanced theme settings": "Skjul avanserte draktinnstillinger", + "Show advanced theme settings": "Vis avanserte draktinnstillinger", + "Theme": "Drakt", + "Room list": "Romliste", + "Font size and typeface": "Størrelse på og type skrift", + "Sound pack": "Lydpakke", + "Schildi: Softer sounds for reduced anxiety": "Schildi: Mykere lyder for mindre angst", + "System": "System", + "Add custom theme": "Legg til egendefinert drakt", + "Theme in use": "Drakt i bruk", + "Light theme": "Lys drakt", + "Dark theme": "Mørk drakt", + "Mark as read": "Marker som lest", + "Mark rooms as unread": "Tillat markering av sludringer som uleste", + "Mark as unread": "Marker som ulest", + "In group chats": "I gruppesludringer", + "In public rooms": "I offentlige rom", + "For people": "For folk", + "Classic: The same sharp sounds as Element": "Klassisk: Samme skarpe lyder som Element", + "Collapse additional buttons": "Fold sammen ytterligere knapper", + "Corners": "Hjørner", + "Round": "Runde", + "Extra round": "Ekstra runde", + "Mixed": "Blandet" } From 7f80df5ca6d16d6cd194825c6253831d03bbce26 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 22 Aug 2022 23:33:14 +0200 Subject: [PATCH 86/89] New test release v1.11.3-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 ba6b8bf..bb09b97 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit ba6b8bf283a92c3f80539eab5b1c62e396b6e93e +Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3 diff --git a/element-web b/element-web index 1203f15..2a51d27 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1203f1530d67863a4cb27d25851d46eecebf5685 +Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488 diff --git a/matrix-js-sdk b/matrix-js-sdk index d0951b8..c2deb2a 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit d0951b83471f5fcabdfe14b5df497dc54acbeda4 +Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1 diff --git a/matrix-react-sdk b/matrix-react-sdk index f05b786..bf34169 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit f05b786171f1d6997076a59764f359ed5d0fdc27 +Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39 From a2a87f04ca7ad9b723b415272ef096b5ca342654 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 16:08:46 +0200 Subject: [PATCH 87/89] New test release v1.11.4-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 bb09b97..46855f6 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit bb09b97684db6927539a57ac05356bb7b6dffad3 +Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df diff --git a/element-web b/element-web index 2a51d27..f31e989 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2a51d277c7bc83b1b001d1aae50574bfb812d488 +Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f diff --git a/matrix-js-sdk b/matrix-js-sdk index c2deb2a..12f88b5 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c2deb2a20e687b1ef566a3e21ae3c5c18b473dd1 +Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded diff --git a/matrix-react-sdk b/matrix-react-sdk index bf34169..1ce24a8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit bf34169e576fde32cc9b0384eed22220b311ef39 +Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283 From 04cb55d6c3c554653965936fa77550bb732a6b6a Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 16:29:29 +0200 Subject: [PATCH 88/89] New test release v1.11.4-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 46855f6..c5897c9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 46855f60e8a6f110ae8c88dfe79e3ce18f4929df +Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f diff --git a/element-web b/element-web index f31e989..7a9cdfe 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit f31e9899f3256c64495a6c3bdc28d28e0a5b237f +Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67 diff --git a/matrix-react-sdk b/matrix-react-sdk index 1ce24a8..d4472ad 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 1ce24a82ed7928ad768af64a11d822886884c283 +Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170 From 05ff60b4c3445623b1b902f4e8c9ad6359848da6 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 19:02:18 +0200 Subject: [PATCH 89/89] New release v1.11.4-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index c5897c9..d65b86b 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit c5897c9412e17c29c43f721c3c48cec500911b4f +Subproject commit d65b86bd451608954aadaccba8210ea3e658a16e diff --git a/element-web b/element-web index 7a9cdfe..70a4064 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 7a9cdfe392ad351b16ee261b9e3ee9ec5782fb67 +Subproject commit 70a406478e2a7dcefdbc877d0f223d5e6623dd18