diff --git a/Makefile b/Makefile
index e2f261b..95fd274 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,19 +60,15 @@ 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
desktop-common: web
$(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 ''
diff --git a/README.md b/README.md
index 20b0099..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)
@@ -15,6 +16,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
@@ -39,7 +52,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
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
diff --git a/element-desktop b/element-desktop
index f9a3d9d..1d3a14d 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit f9a3d9d4d29cc136706888996110591b0d1921df
+Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b
diff --git a/element-web b/element-web
index 6c6eba1..11fedf6 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit 6c6eba1fac8df055c95919fc8caf98a44a4538a3
+Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a
diff --git a/i18n-overlays/matrix-react-sdk/cs.json b/i18n-overlays/matrix-react-sdk/cs.json
index 8f37a96..f4e03bb 100644
--- a/i18n-overlays/matrix-react-sdk/cs.json
+++ b/i18n-overlays/matrix-react-sdk/cs.json
@@ -41,5 +41,7 @@
"Mark rooms as unread": "Povolit označování chatů jako nepřečtených",
"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"
+ "Enable YouTube embed player": "Povolí vložený přehrávač YouTube",
+ "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."
}
diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json
index e65cb3d..02c1ee5 100644
--- a/i18n-overlays/matrix-react-sdk/de_DE.json
+++ b/i18n-overlays/matrix-react-sdk/de_DE.json
@@ -141,5 +141,7 @@
"Show advanced theme settings": "Erweiterte Designeinstellungen anzeigen",
"Mark rooms as unread": "Erlaube Chats als ungelesen zu markieren",
"Mark as read": "Als gelesen markieren",
- "Mark as unread": "Als ungelesen markieren"
+ "Mark as unread": "Als ungelesen markieren",
+ "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
+ "Collapse additional buttons": "Zusätzliche Buttons einklappen"
}
diff --git a/i18n-overlays/matrix-react-sdk/en_EN.json b/i18n-overlays/matrix-react-sdk/en_EN.json
index dda71e0..8d07295 100644
--- a/i18n-overlays/matrix-react-sdk/en_EN.json
+++ b/i18n-overlays/matrix-react-sdk/en_EN.json
@@ -41,5 +41,6 @@
"Mark as unread": "Mark as unread",
"Mark as read": "Mark as read",
"Enable YouTube embed player": "Enable YouTube embed player",
- "Collapse additional buttons": "Collapse additional buttons"
+ "Collapse additional buttons": "Collapse additional buttons",
+ "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms."
}
diff --git a/i18n-overlays/matrix-react-sdk/id.json b/i18n-overlays/matrix-react-sdk/id.json
index cd66942..a986a4d 100644
--- a/i18n-overlays/matrix-react-sdk/id.json
+++ b/i18n-overlays/matrix-react-sdk/id.json
@@ -40,5 +40,7 @@
"Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca",
"Mark as unread": "Tandai sebagai belum dibaca",
"Mark as read": "Tandai sebagai dibaca",
- "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat"
+ "Enable YouTube embed player": "Aktifkan pemain YouTube tersemat",
+ "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."
}
diff --git a/i18n-overlays/matrix-react-sdk/sv.json b/i18n-overlays/matrix-react-sdk/sv.json
index 94b8219..7282f7f 100644
--- a/i18n-overlays/matrix-react-sdk/sv.json
+++ b/i18n-overlays/matrix-react-sdk/sv.json
@@ -40,5 +40,7 @@
"Mark as unread": "markera som oläst",
"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"
+ "Enable YouTube embed player": "Aktivera inbäddad YouTube-spelare",
+ "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."
}
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": "折叠额外的按钮"
}
diff --git a/matrix-js-sdk b/matrix-js-sdk
index 8502dd1..ee15b18 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit 8502dd1647e5058d59f68fa235ca65d0ef2dad30
+Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f
diff --git a/matrix-react-sdk b/matrix-react-sdk
index 4387b1f..f167688 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit 4387b1f0f443af9e5ed664b026391a9016213914
+Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef