diff --git a/Makefile b/Makefile index 95fd274..e2f261b 100644 --- a/Makefile +++ b/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 '' 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 5fb3c3f..0ee1a2a 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit 5fb3c3f8f21de8d82c76c76b56a8dd024b5e213d +Subproject commit 0ee1a2ad165615e6c3e15a2bbde7f3895977cef8 diff --git a/element-web b/element-web index 3e1e6f8..b4f26a6 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit 3e1e6f8413a452e77a41ddbb4bdd453fa8bd209f +Subproject commit b4f26a6c52c76b4a6139051470820b41066ff289 diff --git a/i18n-overlays/matrix-react-sdk/de_DE.json b/i18n-overlays/matrix-react-sdk/de_DE.json index 3bb30e2..02c1ee5 100644 --- a/i18n-overlays/matrix-react-sdk/de_DE.json +++ b/i18n-overlays/matrix-react-sdk/de_DE.json @@ -143,10 +143,5 @@ "Mark as read": "Als gelesen markieren", "Mark as unread": "Als ungelesen markieren", "Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren", - "Collapse additional buttons": "Zusätzliche Buttons einklappen", - "Round": "Rund", - "Mixed": "Gemischt", - "Corners": "Ecken", - "Extra round": "Extra rund", - "Home is useful for getting an overview of everything. Keep in mind that disabling it could leave you unable to see certain rooms.": "Die Startseite hilft dir, einen Überblick über deine Chats zu bekommen. Bedenke, dass die Deaktivierung dazu führen kann, dass du bestimmte Räume nicht sehen kannst." + "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 e45eaab..8d07295 100644 --- a/i18n-overlays/matrix-react-sdk/en_EN.json +++ b/i18n-overlays/matrix-react-sdk/en_EN.json @@ -42,9 +42,5 @@ "Mark as read": "Mark as read", "Enable YouTube embed player": "Enable YouTube embed player", "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.", - "Corners": "Corners", - "Round": "Round", - "Extra round": "Extra round", - "Mixed": "Mixed" + "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/zh_Hans.json b/i18n-overlays/matrix-react-sdk/zh_Hans.json index aef112a..6702566 100644 --- a/i18n-overlays/matrix-react-sdk/zh_Hans.json +++ b/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": "标记为未读", - "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": "折叠额外的按钮" + "Mark as unread": "标记为未读" } diff --git a/matrix-js-sdk b/matrix-js-sdk index ee15b18..e82be9f 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f +Subproject commit e82be9fc93f409acaa257f6b317ac9cbb7bab9d5 diff --git a/matrix-react-sdk b/matrix-react-sdk index 5b96624..cea7c0e 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit 5b9662482613e3e74b49d7d8fa7684cda3dd839e +Subproject commit cea7c0e1006b859a3fdebe2e32423319c1986d74