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 01/11] 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 b6ed8d444bd20e206926a011daf1e010770dd545 Mon Sep 17 00:00:00 2001 From: su-ex Date: Mon, 9 May 2022 09:42:44 +0200 Subject: [PATCH 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] 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 07/11] 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 08/11] 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 09/11] 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 10/11] 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 11/11] 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