Makefile

@@ -1,4 +1,4 @@
-.PHONY: all setup regenerate-i18n web desktop-common linux debian rpm pacman local-pkgbuild local-pkgbuild-install windows windows-portable
+.PHONY: all setup regenerate-i18n reskindex 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,15 +60,19 @@ 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
+web: setup reskindex
 	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 ''
-	SQLCIPHER_STATIC=1 $(YARN) --cwd element-desktop run build:native
+	$(YARN) --cwd element-desktop run build:native
 
 macos-common: web icns
 	$(YARN) --cwd element-desktop run fetch --cfgdir ''

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)
+- A unified chat list for both direct and group chats
-- 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)  
@@ -16,18 +15,6 @@ Feel free to [join the discussion on matrix](https://matrix.to/#/#schildichat-we
 
 <img src="https://raw.githubusercontent.com/SchildiChat/schildichat-desktop/sc/screenshots/1.png"/>
 
-<details>
-<summary>Public key used to sign the Debian packages</summary>
-
-```
-pub   rsa4096 2020-12-08 [SC]
-      560BB70DA86A6633A39CEC6023358905FE294D01
-uid           Super apt repo key <apt@supercable.onl>
-sub   rsa4096 2020-12-08 [E]
-```
-
-</details>
-
 
 ## Building SchildiChat Web/Desktop
 
@@ -52,7 +39,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

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 -s "v$versions_string" -m "New release v$versions_string"
+git tag -a "v$versions_string" -m "New release v$versions_string"
 
 popd > /dev/null

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 -s "v$versions_string" -m "New test release v$versions_string"
+git tag -a "v$versions_string" -m "New test release v$versions_string"
 
 popd > /dev/null

element-desktop

@@ -1 +1 @@
-Subproject commit 1d3a14db9c017d935085611c3259f386e19a366b
+Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b

element-web

@@ -1 +1 @@
-Subproject commit 11fedf60a5067b7139a90b70b0e672acd4e8f82a
+Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755

i18n-overlays/matrix-react-sdk/cs.json

@@ -42,6 +42,5 @@
     "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."
 }

i18n-overlays/matrix-react-sdk/id.json

@@ -41,6 +41,5 @@
     "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."
 }

i18n-overlays/matrix-react-sdk/sv.json

@@ -41,6 +41,5 @@
     "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."
 }

i18n-overlays/matrix-react-sdk/zh_Hans.json

@@ -39,8 +39,5 @@
     "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": "折叠额外的按钮"
 }

matrix-js-sdk

@@ -1 +1 @@
-Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f
+Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd

matrix-react-sdk

@@ -1 +1 @@
-Subproject commit f1676885198c4544e73a103571c0d14dcfcadeef
+Subproject commit 0d1b0bc5b73a2099e2a0aa2dc32b878aa2fb27cb