From fe615fa0996a09a0316066cff15bc385cac9886b Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 1 Apr 2022 17:34:31 +0200 Subject: [PATCH 1/7] 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 6/7] 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 7/7] 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