From 7b4678e91d4eb1ba7b32bea1804d8042bd93fb5e Mon Sep 17 00:00:00 2001 From: su-ex Date: Sat, 16 Apr 2022 16:13:26 +0200 Subject: [PATCH 01/15] 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 02/15] 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 03/15] 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 04/15] 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 05/15] 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 06/15] 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 07/15] 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 08/15] 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 09/15] 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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