From fe615fa0996a09a0316066cff15bc385cac9886b Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 1 Apr 2022 17:34:31 +0200 Subject: [PATCH 01/78] 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 02/78] 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 03/78] 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 04/78] 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 05/78] 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 06/78] 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 07/78] 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 08/78] 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 09/78] 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 10/78] 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 11/78] 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 12/78] 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 13/78] 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 14/78] 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 15/78] 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 16/78] 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 17/78] 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 18/78] 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 19/78] 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 20/78] 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 21/78] 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 22/78] 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 23/78] 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 24/78] 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 25/78] 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 26/78] 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 27/78] 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 28/78] 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 29/78] 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 30/78] 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 31/78] 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 32/78] 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 33/78] 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 34/78] 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 35/78] 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 36/78] 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 37/78] 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 38/78] 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 39/78] 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 40/78] 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 41/78] 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 42/78] 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 43/78] 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 44/78] 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 45/78] 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 46/78] 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 47/78] =?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 48/78] 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 49/78] 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 50/78] 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 51/78] 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 From cd8998da62dfdc8531ad8b1509f4ad61caf75fd8 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 22:04:10 +0200 Subject: [PATCH 52/78] Add script for changelog generation --- generate_changelog.sh | 61 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100755 generate_changelog.sh diff --git a/generate_changelog.sh b/generate_changelog.sh new file mode 100755 index 0000000..3bca794 --- /dev/null +++ b/generate_changelog.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +set -e + +mydir="$(dirname "$(realpath "$0")")" + +pushd "$mydir" > /dev/null + +source ./merge_helpers.sh + +# Check branch +check_branch $branch +forall_repos check_branch $branch + +# Ensure clean git state +forall_repos check_clean_git + +# Fetch upstream +forall_repos git fetch origin > /dev/null +forall_repos git fetch upstream > /dev/null + +( + # Add new line below git log: https://unix.stackexchange.com/a/345558 + + get_latest_upstream_tag + forelement_repos git log --pretty=format:"- %s" "sc" "^$latest_upstream_tag" "^master" \ + | printf '%s\n' "$(cat)" \ + | sed "s|Merge tag '\\(.*\\)' into sc.*|Update codebase to Element \1|" \ + | sed "s|Merge tag '\\(.*\\)' into merge.*|Update codebase to Element \1|" + + get_current_mxsdk_tags + + pushd "matrix-js-sdk" > /dev/null + git log --pretty=format:"- %s" "sc" "^$current_mxjssdk_tag" "^master" \ + | printf '%s\n' "$(cat)" \ + | grep -v "Merge .*tag" + popd > /dev/null + + pushd "matrix-react-sdk" > /dev/null + git log --pretty=format:"- %s" "sc" "^$current_mxreactsdk_tag" "^master" \ + | printf '%s\n' "$(cat)" \ + | grep -v "Merge .*tag" + popd > /dev/null +) \ + | grep -v "Automatic i18n reversion" \ + | grep -v "Automatic package.json reversion" \ + | grep -v "Merge .*branch" \ + | grep -v "Automatic theme update" \ + | grep -v "Automatic package.json adjustment" \ + | grep -v "Automatic i18n adjustment" \ + | grep -v "Update version to .*-sc\\..*" \ + | grep -v "\\.sh" \ + | grep -v "\\.md" \ + | grep -v "Added translation using Weblate" \ + | grep -v "Translated using Weblate" \ + | grep -v "weblate/sc" \ + | grep -v "\\[.*merge.*\\]" \ + | awk '!seen[$0]++' `# https://stackoverflow.com/a/1444448` \ + || echo "No significant changes since the last stable release" + +popd > /dev/null From dfa7921f9ad0141969faecc7e29c1b07886e1e4b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 22:26:58 +0200 Subject: [PATCH 53/78] Makefile: fixup just too useful everywhere --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 95fd274..21c3bf4 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .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 +.PHONY: clean undo_setup fixup CFGDIR ?= configs/sc @@ -166,3 +166,11 @@ clean: rm -rf element-web/dist rm -rf local-pkgbuild rm -f bom.lock + +undo_setup: + rm -rf element-desktop/node_modules element-web/node_modules matrix-react-sdk/node_modules matrix-js-sdk/node_modules i18n-helper/node_modules element-desktop/.hak + +fixup: undo_setup + make setup + make clean + make setup From 30dc3ba5b9febbca7318ab433f53c1431091654e Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 3 Sep 2022 23:11:51 +0200 Subject: [PATCH 54/78] readme: Debian node 16 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f4d437d..9b1ea85 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The following are the dependencies required to build SchildiChat Web/Desktop on ``` # 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 - +# curl -sL https://deb.nodesource.com/setup_16.x | bash - # apt update # apt install nodejs From e886c4c135935a86e89d18f8110312de82c09349 Mon Sep 17 00:00:00 2001 From: su-ex Date: Thu, 15 Sep 2022 17:46:31 +0200 Subject: [PATCH 55/78] New test release v1.11.5-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 d65b86b..acf7d17 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d65b86bd451608954aadaccba8210ea3e658a16e +Subproject commit acf7d174d2e91294db6b5c450d8bda5b7fde68dc diff --git a/element-web b/element-web index 70a4064..183a165 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 70a406478e2a7dcefdbc877d0f223d5e6623dd18 +Subproject commit 183a16501659bbd0f9a8178ebaa2c5a0ea252db5 diff --git a/matrix-js-sdk b/matrix-js-sdk index 12f88b5..e944aac 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 12f88b5b4ea4958c03c15bede071224080a50ded +Subproject commit e944aacab07f03fd8d13559243cbd240e4b7f2c3 diff --git a/matrix-react-sdk b/matrix-react-sdk index d4472ad..a552159 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d4472adb3a895e5b8d4bbcc435c3adac6e5ac170 +Subproject commit a55215909b7a1a526b2b11604f6327f2233232f2 From fc8900cf13c74790525901a2758307d83808dc23 Mon Sep 17 00:00:00 2001 From: Anonimas Date: Fri, 16 Sep 2022 17:58:33 +0000 Subject: [PATCH 56/78] Translated using Weblate (Lithuanian) 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/lt/ --- i18n-overlays/matrix-react-sdk/lt.json | 34 +++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/lt.json b/i18n-overlays/matrix-react-sdk/lt.json index 2b32484..7013517 100644 --- a/i18n-overlays/matrix-react-sdk/lt.json +++ b/i18n-overlays/matrix-react-sdk/lt.json @@ -17,5 +17,37 @@ "In group chats": "Pokalbių grupėse", "In public rooms": "Viešuose kambariuose", "Show all rooms in Home": "Rodyti visus kambarius Pradžioje", - "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje." + "All rooms you're in will appear in Home.": "Visi kambariai kuriuose esate bus rodomi Pradžioje.", + "Hide advanced theme settings": "Slėpti išplėstinius temos nustatymus", + "Show advanced theme settings": "Rodyti išplėstinius temos nustatymus", + "Theme": "Tema", + "Font size and typeface": "Šrifto dydis ir raštas", + "Show message bubbles depending on the width either on both sides or only on one side": "Rodyti žinučių burbulus, priklausomai nuo pločio, abiejose pusėse arba tik vienoje pusėje", + "Sound pack": "Garso paketas", + "Schildi: Softer sounds for reduced anxiety": "Schildi: švelnesni garsai sumažintam nerimui", + "Classic: The same sharp sounds as Element": "Klasikiniai: Tie patys aštrūs garsai kaip ir Element", + "Enable YouTube embed player": "Įgalinti YouTube įterptą grotuvą", + "Add custom theme": "Pridėti pasirinktinę temą", + "Mark as unread": "Žymėti kaip neskaitytą", + "Mark as read": "Žymėti kaip perskaitytą", + "User name color mode": "Naudotojo vardo spalvų režimas", + "Uniform": "Vienodi", + "Show notification badges for People in Spaces": "Rodyti pranešimų ženkliukus žmonėms erdvėse", + "Return to the room previously opened in a space": "Grįžti į anksčiau atidarytą kambarį erdvėje", + "If disabled, the space overview will be shown when switching to another space.": "Jei išjungta, perjungiant į kitą erdvę bus rodoma erdvės apžvalga.", + "Room list style": "Kambarių sąrašo stilius", + "Compact: tiny avatar together with name and preview in one line": "Kompaktiška: mažytis avataras kartu su vardu ir peržiūra vienoje eilutėje", + "Intermediate: medium sized avatar with single-line preview": "Vidutinis: vidutinio dydžio avataras su vienos eilutės peržiūra", + "Roomy: big avatar with two-line preview": "Erdvus: didelis avataras su dviejų eilučių peržiūra", + "PowerLevel": "Galios lygis", + "For people": "Žmonėms", + "Show people in spaces": "Rodyti žmones erdvėse", + "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.": "Jei išjungta, vis tiek galite pridėti tiesioginius pokalbius į asmenines erdves. Jei ši funkcija įjungta, automatiškai matysite visus, kurie yra erdvės nariai.", + "Mark rooms as unread": "Leisti žymėti pokalbius kaip neskaitytus", + "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Pradžia yra naudinga, kad galėtumėte viską apžvelgti. Turėkite omenyje, kad ją išjungę galite nematyti tam tikrų kambarių.", + "Collapse additional buttons": "Sulankstyti papildomus mygtukus", + "Corners": "Kampai", + "Round": "Apvalus", + "Extra round": "Ypač apvalus", + "Mixed": "Mišrus" } From 6c5136d8445bd524157823307500212350e37a15 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 13:08:02 +0200 Subject: [PATCH 57/78] New test release v1.11.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 acf7d17..6649063 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit acf7d174d2e91294db6b5c450d8bda5b7fde68dc +Subproject commit 66490633aab37e120a68c8e0e895dfdb6a583f29 diff --git a/element-web b/element-web index 183a165..8ed0e54 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 183a16501659bbd0f9a8178ebaa2c5a0ea252db5 +Subproject commit 8ed0e546a9cdae94b58e154d8d3fbd404220bf72 diff --git a/matrix-js-sdk b/matrix-js-sdk index e944aac..cb81a65 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit e944aacab07f03fd8d13559243cbd240e4b7f2c3 +Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 diff --git a/matrix-react-sdk b/matrix-react-sdk index a552159..d140a7a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit a55215909b7a1a526b2b11604f6327f2233232f2 +Subproject commit d140a7a09455dc85f837080fd778d24c9166968f From a7c084d6f8c93e1de08808f31760d1c149bdb667 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 13:35:57 +0200 Subject: [PATCH 58/78] New test release v1.11.6-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 6649063..e8138b9 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 66490633aab37e120a68c8e0e895dfdb6a583f29 +Subproject commit e8138b904e656a28f0a2ad260f3ab9f5d85af401 diff --git a/element-web b/element-web index 8ed0e54..ed7c271 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8ed0e546a9cdae94b58e154d8d3fbd404220bf72 +Subproject commit ed7c271bc8028760639bdee69387bc58956c556b diff --git a/matrix-react-sdk b/matrix-react-sdk index d140a7a..a8c4ff4 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit d140a7a09455dc85f837080fd778d24c9166968f +Subproject commit a8c4ff42459a33610b1cba4105b9cdc4f52eaa64 From 95d46b08b4260f1a0e189105fffb6f0471f3473d Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 14:34:33 +0200 Subject: [PATCH 59/78] New test release v1.11.6-sc.0.test.3 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index e8138b9..cbcbe7f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e8138b904e656a28f0a2ad260f3ab9f5d85af401 +Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b diff --git a/element-web b/element-web index ed7c271..8a4c07f 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ed7c271bc8028760639bdee69387bc58956c556b +Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb diff --git a/matrix-react-sdk b/matrix-react-sdk index a8c4ff4..eb6b8d0 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit a8c4ff42459a33610b1cba4105b9cdc4f52eaa64 +Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a From 77fbeb625cc885e229f3e2eb1b5aea11f2d0ede5 Mon Sep 17 00:00:00 2001 From: su-ex Date: Wed, 28 Sep 2022 19:49:26 +0200 Subject: [PATCH 60/78] New release v1.11.8-sc.1 --- element-desktop | 2 +- element-web | 2 +- generate_changelog.sh | 4 ++-- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/element-desktop b/element-desktop index cbcbe7f..0be4f8f 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit cbcbe7ff684f4200e362d0bc7178281b2c79d89b +Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461 diff --git a/element-web b/element-web index 8a4c07f..ef58800 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 8a4c07f24559dc0888413f9fc714d1bb6eecfecb +Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca diff --git a/generate_changelog.sh b/generate_changelog.sh index 3bca794..1e65601 100755 --- a/generate_changelog.sh +++ b/generate_changelog.sh @@ -16,8 +16,8 @@ forall_repos check_branch $branch forall_repos check_clean_git # Fetch upstream -forall_repos git fetch origin > /dev/null -forall_repos git fetch upstream > /dev/null +forall_repos git fetch origin > /dev/null 2>/dev/null +forall_repos git fetch upstream > /dev/null 2>/dev/null ( # Add new line below git log: https://unix.stackexchange.com/a/345558 diff --git a/matrix-js-sdk b/matrix-js-sdk index cb81a65..c2f7795 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 +Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db diff --git a/matrix-react-sdk b/matrix-react-sdk index eb6b8d0..0d5ad44 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit eb6b8d0b878102c5fe7420e185667e450f99cf7a +Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b From b9d35c0cc10d12f3d4af25ffba200977410f80d9 Mon Sep 17 00:00:00 2001 From: autoteelar Date: Wed, 26 Oct 2022 10:50:41 +0200 Subject: [PATCH 61/78] Added translation using Weblate (Japanese) --- i18n-overlays/matrix-react-sdk/ja.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/matrix-react-sdk/ja.json diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/matrix-react-sdk/ja.json @@ -0,0 +1 @@ +{} From c2318080eb5f8702006fe2560c77b9c31805bbae Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 26 Oct 2022 10:50:49 +0200 Subject: [PATCH 62/78] Added translation using Weblate (Japanese) --- i18n-overlays/element-web/ja.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-web/ja.json diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-web/ja.json @@ -0,0 +1 @@ +{} From 92599de20a2546f94bcf6e4d7c668283e939632a Mon Sep 17 00:00:00 2001 From: Weblate Date: Wed, 26 Oct 2022 10:50:50 +0200 Subject: [PATCH 63/78] Added translation using Weblate (Japanese) --- i18n-overlays/element-desktop/ja.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 i18n-overlays/element-desktop/ja.json diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-desktop/ja.json @@ -0,0 +1 @@ +{} From ae1e15dcef70345d5a469d2bb62e4eee294892d4 Mon Sep 17 00:00:00 2001 From: autoteelar Date: Wed, 26 Oct 2022 09:00:38 +0000 Subject: [PATCH 64/78] Translated using Weblate (Japanese) Currently translated at 1.9% (1 of 51 strings) Translation: SchildiChat/matrix-react-sdk Translate-URL: https://weblate.bubu1.eu/projects/schildichat/matrix-react-sdk/ja/ --- i18n-overlays/matrix-react-sdk/ja.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json index 0967ef4..fedc533 100644 --- a/i18n-overlays/matrix-react-sdk/ja.json +++ b/i18n-overlays/matrix-react-sdk/ja.json @@ -1 +1,3 @@ -{} +{ + "Normal priority": "常優先度" +} From e22b6bb03124e9a0d86fa7aaab1aa59216906587 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 29 Oct 2022 23:41:13 +0200 Subject: [PATCH 65/78] New test release v1.11.12-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 0be4f8f..6ecf8c3 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461 +Subproject commit 6ecf8c30e0f96bd078dbdcd421f48418f54a91ed diff --git a/element-web b/element-web index ef58800..a75d0d9 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca +Subproject commit a75d0d9055906f44503acb8f1152260e02c6547f diff --git a/matrix-js-sdk b/matrix-js-sdk index c2f7795..9b20f5c 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db +Subproject commit 9b20f5c3ef02568ee302f0c6ed633f07f7f8e498 diff --git a/matrix-react-sdk b/matrix-react-sdk index 0d5ad44..68f9948 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b +Subproject commit 68f99488f590bb3623ee2bcf096a697e8d38505b From 6bc26949c13a4153061ed2692830c6804e7b6ea1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 30 Oct 2022 12:08:59 +0100 Subject: [PATCH 66/78] New test release v1.11.12-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index 6ecf8c3..87b2e3d 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 6ecf8c30e0f96bd078dbdcd421f48418f54a91ed +Subproject commit 87b2e3d7a3158c999b480e13fb23ab5774237dd9 diff --git a/element-web b/element-web index a75d0d9..886408b 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit a75d0d9055906f44503acb8f1152260e02c6547f +Subproject commit 886408b58153fb15f9691c6ac0f3c31aec40f261 diff --git a/matrix-react-sdk b/matrix-react-sdk index 68f9948..e3761d8 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 68f99488f590bb3623ee2bcf096a697e8d38505b +Subproject commit e3761d887d8987f4b97b567962bb453f901c5f72 From e26d244c1eafe9e128ab1a35cbd6eb927a943713 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 4 Nov 2022 21:17:04 +0100 Subject: [PATCH 67/78] New test release v1.11.13-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 87b2e3d..4912004 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 87b2e3d7a3158c999b480e13fb23ab5774237dd9 +Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6 diff --git a/element-web b/element-web index 886408b..2abfc19 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 886408b58153fb15f9691c6ac0f3c31aec40f261 +Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c diff --git a/matrix-js-sdk b/matrix-js-sdk index 9b20f5c..679ba69 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 9b20f5c3ef02568ee302f0c6ed633f07f7f8e498 +Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9 diff --git a/matrix-react-sdk b/matrix-react-sdk index e3761d8..eb43745 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit e3761d887d8987f4b97b567962bb453f901c5f72 +Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1 From 3c405aeaf65d62b0a68b905ac6e6ae652965a159 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Nov 2022 20:22:09 +0100 Subject: [PATCH 68/78] New release v1.11.13-sc.1 --- element-desktop | 2 +- element-web | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/element-desktop b/element-desktop index 4912004..3d6ff48 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 4912004b86dc44cb49e7afcbae64a54fe57f38c6 +Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac diff --git a/element-web b/element-web index 2abfc19..1f45edd 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2abfc19777acff294a8f2895a9daef65163e7c2c +Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2 From b6fe9591539bcc47dc10f61e1717f225a8012a07 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 5 Nov 2022 22:41:56 +0100 Subject: [PATCH 69/78] =?UTF-8?q?Meh,=20flathub=20seems=20to=20require=20P?= =?UTF-8?q?Rs=20now=20=F0=9F=90=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/update-flathub.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh index 31c4ce5..7451aec 100755 --- a/deploy/update-flathub.sh +++ b/deploy/update-flathub.sh @@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath) pushd "$repopath" > /dev/null git fetch +git checkout master git reset --hard origin/master +git checkout -B "release-v$version" + yamlFile="chat.schildi.desktop.yaml" xmlFile="chat.schildi.desktop.metainfo.xml" @@ -33,8 +36,8 @@ sed -i "s|^\s\s$| \n /dev/null -echo "Release v$version published on flathub!" +echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/" From 0bfa5733d5e50816c6d15a24392606b5f0d06e98 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 12 Nov 2022 11:28:31 +0100 Subject: [PATCH 70/78] New test release v1.11.14-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 3d6ff48..07d1283 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 3d6ff486d4a8cafd018aa697dd9e764e729baaac +Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 diff --git a/element-web b/element-web index 1f45edd..d7e4930 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 1f45edd3d08cf91e982e15c575d1c348956101b2 +Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b diff --git a/matrix-js-sdk b/matrix-js-sdk index 679ba69..1474204 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 679ba691ef8bbca0d3518411523c017e2ad8cdf9 +Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 diff --git a/matrix-react-sdk b/matrix-react-sdk index eb43745..c9fb6bb 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit eb43745d74433927e367d8efdc7ad0735b6a28b1 +Subproject commit c9fb6bbbb8bf97802277127601163618669acdee From 92ac040175759ff476bc6aada6874f485dd4a118 Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 15 Nov 2022 23:39:05 +0100 Subject: [PATCH 71/78] Renovate config.json - default_server_name --> default_server_config - Add more room directories --- configs/sc/config.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 2916dee..4af6da3 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -1,6 +1,11 @@ { "update_base_url": null, - "default_server_name": "matrix.org", + "default_server_config": { + "m.homeserver": { + "base_url": "https://matrix-client.matrix.org", + "server_name": "matrix.org" + } + }, "brand": "SchildiChat", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", @@ -14,7 +19,10 @@ "showLabsSettings": true, "roomDirectory": { "servers": [ - "matrix.org" + "matrix.org", + "gitter.im", + "libera.chat", + "schildi.chat" ] }, "enable_presence_by_hs_url": { From 51e7d4b67b71543370c88277007983e51f7a6154 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 26 Nov 2022 00:30:33 +0100 Subject: [PATCH 72/78] New test release v1.11.15-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index 07d1283..dd74e36 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 +Subproject commit dd74e3628176f0ad39097325e5603fec51408a83 diff --git a/element-web b/element-web index d7e4930..fcf043c 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b +Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d diff --git a/matrix-js-sdk b/matrix-js-sdk index 1474204..6128de1 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 +Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636 diff --git a/matrix-react-sdk b/matrix-react-sdk index c9fb6bb..0ad473a 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit c9fb6bbbb8bf97802277127601163618669acdee +Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e From fc27cbfd7476e5b494349e288c6d04e7d5f881c1 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 4 Dec 2022 02:37:55 +0100 Subject: [PATCH 73/78] Allow building using containers Co-authored-by: Paarth Shah Closes #145 --- .containerignore | 1 + Containerfile.debian | 30 ++++++++++++++++++++++++++++++ Containerfile.fedora | 20 ++++++++++++++++++++ Makefile | 25 +++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 .containerignore create mode 100644 Containerfile.debian create mode 100644 Containerfile.fedora diff --git a/.containerignore b/.containerignore new file mode 100644 index 0000000..ae02570 --- /dev/null +++ b/.containerignore @@ -0,0 +1 @@ +release/ \ No newline at end of file diff --git a/Containerfile.debian b/Containerfile.debian new file mode 100644 index 0000000..041c64e --- /dev/null +++ b/Containerfile.debian @@ -0,0 +1,30 @@ +ARG NODE_VERSION +FROM node:${NODE_VERSION} + +RUN apt-get -qq update && apt-get -qq install --no-install-recommends -y \ + curl \ + g++ \ + gcc \ + git \ + jq \ + libarchive-tools \ + libsecret-1-dev \ + libsqlcipher-dev \ + libssl-dev \ + make \ + openssl \ + pkg-config \ + python \ + tcl \ + vim + +ENV RUSTUP_HOME=/usr/local/rustup \ + CARGO_HOME=/usr/local/cargo \ + PATH=/usr/local/cargo/bin:$PATH +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --profile minimal + +COPY . /project +WORKDIR /project + +# There might be remnants of the host which break the build +RUN make fixup \ No newline at end of file diff --git a/Containerfile.fedora b/Containerfile.fedora new file mode 100644 index 0000000..279d43f --- /dev/null +++ b/Containerfile.fedora @@ -0,0 +1,20 @@ +FROM fedora:latest + +RUN dnf install -y openssl openssl-devel rust cargo libsecret libsecret-devel g++ ruby-devel gcc make rpm-build libffi-devel tcl libxcrypt-compat + +# node setup +ARG NODE_VERSION +RUN mkdir -p /usr/local/n +RUN mkdir -p /usr/local/bin /usr/local/lib /usr/local/include /usr/local/share +RUN curl -L https://raw.githubusercontent.com/tj/n/master/bin/n -o n +RUN bash n ${NODE_VERSION} +RUN npm install -g n +RUN npm install -g yarn +RUN npm install -g node-gyp +RUN gem install --ignore-dependencies --no-user-install --no-document fpm + +COPY . /project +WORKDIR /project + +# There might be remnants of the host which break the build +RUN make fixup \ No newline at end of file diff --git a/Makefile b/Makefile index 21c3bf4..c517e5b 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ .PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable .PHONY: web-release debian-release rpm-release pacman-release windows-setup-release windows-unpacked-release windows-portable-release windows-release .PHONY: macos-common macos macos-mas macos-release macos-mas-release icns +.PHONY: container-build-debian container-build-fedora +.PHONY: container-web-release container-debian-release container-rpm-release container-appimage-release .PHONY: clean undo_setup fixup CFGDIR ?= configs/sc @@ -8,6 +10,8 @@ CFGDIR ?= configs/sc all: web YARN ?= yarnpkg +CONTAINER_ENGINE ?= podman +NODE_VERSION ?= 16 VERSION := $(shell grep version element-desktop/package.json | sed 's|.*: \"\(.*\)\",|\1|') WEB_APP_NAME := $(shell grep '"name"' element-web/package.json | head -n 1 | sed 's|.*: \"\(.*\)\",|\1|') @@ -32,6 +36,9 @@ OUT_WIN64_PORTABLE_BETTER_NAME := $(PRODUCT_NAME)_win-portable_v$(VERSION) OUT_MACOS := $(DESKTOP_OUT)/$(PRODUCT_NAME)-$(VERSION)-universal.dmg OUT_MACOS_MAS := $(DESKTOP_OUT)/mas-universal/$(PRODUCT_NAME).app +CONTAINER_IMAGE_DEBIAN := schildichat-desktop-containerbuild-debian +CONTAINER_IMAGE_FEDORA := schildichat-desktop-containerbuild-fedora + RELEASE_DIR := release CURRENT_RELEASE_DIR := $(RELEASE_DIR)/$(VERSION) @@ -153,6 +160,24 @@ macos-mas-release: macos-mas mkdir -p $(CURRENT_RELEASE_DIR) cp $(OUT_MACOS_MAS) $(CURRENT_RELEASE_DIR) +container-build-debian: + $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_DEBIAN) -f Containerfile.debian --build-arg NODE_VERSION=$(NODE_VERSION) . + +container-build-fedora: + $(CONTAINER_ENGINE) build -t $(CONTAINER_IMAGE_FEDORA) -f Containerfile.fedora --build-arg NODE_VERSION=$(NODE_VERSION) . + +container-web-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make web-release + +container-debian-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make debian-release + +container-rpm-release: container-build-fedora + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_FEDORA):latest make rpm-release + +container-appimage-release: container-build-debian + $(CONTAINER_ENGINE) run --rm -ti -v $(PWD)/release:/project/release --security-opt label=disable $(CONTAINER_IMAGE_DEBIAN):latest make appimage-release + bom.lock: element-desktop/yarn.lock element-web/yarn.lock matrix-js-sdk/yarn.lock matrix-react-sdk/yarn.lock ./build-bom.sh bom: bom.lock From a4ab5f55c92db470926b80239e14a1a132ff4fec Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 4 Dec 2022 02:56:38 +0100 Subject: [PATCH 74/78] New test release v1.11.15-sc.0.test.2 --- element-desktop | 2 +- element-web | 2 +- matrix-react-sdk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/element-desktop b/element-desktop index dd74e36..d25e426 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dd74e3628176f0ad39097325e5603fec51408a83 +Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b diff --git a/element-web b/element-web index fcf043c..ebb0d6a 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d +Subproject commit ebb0d6a212299540247587abd345ce633a414813 diff --git a/matrix-react-sdk b/matrix-react-sdk index 0ad473a..23de404 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e +Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951 From eb17c2ad9459437d06d834307b4d5ff23051f80a Mon Sep 17 00:00:00 2001 From: su-ex Date: Tue, 6 Dec 2022 20:08:30 +0100 Subject: [PATCH 75/78] New test release v1.11.16-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index d25e426..dfc6afa 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit d25e426c42d4eeef4fd62aea61642fd66fe7f73b +Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de diff --git a/element-web b/element-web index ebb0d6a..91850ae 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ebb0d6a212299540247587abd345ce633a414813 +Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 diff --git a/matrix-js-sdk b/matrix-js-sdk index 6128de1..789e2bf 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636 +Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f diff --git a/matrix-react-sdk b/matrix-react-sdk index 23de404..2d34475 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 23de404c637747b5f2662b12355b0cbc4ab0d951 +Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 From 9d4602fea6068e42e02a0edfdb4efcd7407d0b57 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Fri, 23 Dec 2022 10:14:00 +0100 Subject: [PATCH 76/78] Add stale automation github action --- .github/workflows/stale.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/stale.yml diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 0000000..674a67d --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,17 @@ +name: 'Close stale issues' +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-latest + steps: + - uses: actions/stale@v6 + with: + stale-issue-message: 'This issue is stale because it has been open 150 days with no activity. Remove stale label or comment or this will be closed in 14 days.' + days-before-issue-stale: 150 + days-before-issue-close: 14 + days-before-pr-stale: -1 + days-before-pr-close: -1 + exempt-issue-labels: 'longterm,enhancement,parity-with-android,prio:medium,prio:high,electron issue,encrypted room search,build infrastructure' From 775fb00b75bb2c245ddbfedb6d0fd098f5ab8595 Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 15 Jan 2023 12:31:07 +0100 Subject: [PATCH 77/78] Adjust default config.json to changed property names --- configs/sc/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/sc/config.json b/configs/sc/config.json index 4af6da3..0402a78 100644 --- a/configs/sc/config.json +++ b/configs/sc/config.json @@ -16,8 +16,8 @@ "https://scalar-staging.vector.im/api", "https://scalar-staging.riot.im/scalar/api" ], - "showLabsSettings": true, - "roomDirectory": { + "show_labs_settings": true, + "room_directory": { "servers": [ "matrix.org", "gitter.im", From 965a3b2d0e7df545105e084c82e26de0ff6ef03b Mon Sep 17 00:00:00 2001 From: su-ex Date: Sun, 15 Jan 2023 12:33:34 +0100 Subject: [PATCH 78/78] New test release v1.11.17-sc.0.test.1 --- element-desktop | 2 +- element-web | 2 +- matrix-js-sdk | 2 +- matrix-react-sdk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/element-desktop b/element-desktop index dfc6afa..86f7509 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit dfc6afa8d8d8e100010d67a3aa328e99ec9813de +Subproject commit 86f7509f07039d94f43c3736518425eef0d43b3a diff --git a/element-web b/element-web index 91850ae..02ec7bb 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 91850ae97a951c4c011d9767203b839a274c2b55 +Subproject commit 02ec7bb3b0ffa47aca0d59a92788ef55ef481e78 diff --git a/matrix-js-sdk b/matrix-js-sdk index 789e2bf..b9afe23 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit 789e2bf3f3b6abd0877e50df29802b1382a8399f +Subproject commit b9afe2320caee4969dc64c09ba680f0041e3ca5a diff --git a/matrix-react-sdk b/matrix-react-sdk index 2d34475..7ebde05 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 2d34475d29e074c6f35623f2882c09c95b31dd70 +Subproject commit 7ebde053f052965a463ab5b710110be33a2f4a1c