From 74127c8d7be37b90a6839eb64c5508737a50a821 Mon Sep 17 00:00:00 2001 From: su-ex Date: Fri, 13 May 2022 23:01:59 +0200 Subject: [PATCH 01/10] 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 02/10] 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 03/10] 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 04/10] 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 05/10] 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 06/10] 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 07/10] 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 08/10] 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 09/10] 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 10/10] 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