Compare commits

..

No commits in common. "v1.10.15-sc.0.test.2" and "v1.10.11-sc.0.test.2" have entirely different histories.

9 changed files with 11 additions and 24 deletions

View file

@ -68,7 +68,7 @@ web: setup
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 ''

View file

@ -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

@ -1 +1 @@
Subproject commit 5fb3c3f8f21de8d82c76c76b56a8dd024b5e213d
Subproject commit 64d9fadbbeae8e109d237d185e2c865a63004a83

@ -1 +1 @@
Subproject commit 3e1e6f8413a452e77a41ddbb4bdd453fa8bd209f
Subproject commit 9bd6ec343318a5056bcc4becfdc738d5727a277d

View file

@ -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"
}

View file

@ -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."
}

View file

@ -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": "标记为未读"
}

@ -1 +1 @@
Subproject commit ee15b188973d85c3e23a169e0b79f4bda58aa35f
Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2

@ -1 +1 @@
Subproject commit 5b9662482613e3e74b49d7d8fa7684cda3dd839e
Subproject commit c1a277047410e74ae24d3737fe514c7579f98878