diff --git a/Makefile b/Makefile index e099073..5a897e6 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,6 @@ 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 diff --git a/README.md b/README.md index f4d437d..12a7bb2 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,9 @@ 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: -- 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 +- A unified chat list for both direct and group chats - 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) @@ -52,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 openssl libssl-dev tcl +# apt install vim curl git make gcc g++ python jq libsqlcipher-dev pkg-config libsecret-1-dev libarchive-tools # curl -sL https://deb.nodesource.com/setup_14.x | bash - # apt update diff --git a/element-desktop b/element-desktop index 13b4cb7..686a02c 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 13b4cb7e3d51fd626d35a8cdb16f31894c19a20b +Subproject commit 686a02cc404525713d1815b9662b19d83e637c85 diff --git a/element-web b/element-web index 2eaaf0f..863bae4 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 2eaaf0f577ba9fc9ec8c5b38b10f38cf82195df0 +Subproject commit 863bae40dd9bd5a70818269b13e28009b549a7a3 diff --git a/matrix-js-sdk b/matrix-js-sdk index ee15b18..a7e6126 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f +Subproject commit a7e612697579ac57a3a80ab9809d891919f652b8 diff --git a/matrix-react-sdk b/matrix-react-sdk index 8d9129f..7038265 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 8d9129f329ce137bd519f7116bfdf693d74a1609 +Subproject commit 7038265fa5357e89d562f96d14d37b497fad10dc