mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-07-02 21:50:04 +02:00
Compare commits
56 commits
v1.9.5-sc.
...
v1.10.11-s
Author | SHA1 | Date | |
---|---|---|---|
![]() |
921f3c5a0a | ||
![]() |
72166a9a90 | ||
![]() |
3b2da6b386 | ||
![]() |
982c2ac09b | ||
![]() |
58e2f34b63 | ||
![]() |
3d67db61b6 | ||
![]() |
ad2fc85f24 | ||
![]() |
a20f05c933 | ||
![]() |
3b5d16de82 | ||
![]() |
7b4678e91d | ||
![]() |
fe615fa099 | ||
![]() |
a0f99d1c86 | ||
![]() |
1e90e778bb | ||
![]() |
0bc5275d14 | ||
![]() |
79ac866bed | ||
![]() |
bcf9db8b8f | ||
![]() |
dd75a20e7a | ||
![]() |
c07881ba34 | ||
![]() |
3957463f72 | ||
![]() |
d0b9a59e59 | ||
![]() |
40694fb207 | ||
![]() |
5a232a27db | ||
![]() |
602d6bcc91 | ||
![]() |
768b648981 | ||
![]() |
909043215f | ||
![]() |
7228bf7fee | ||
![]() |
84be27839c | ||
![]() |
c655803783 | ||
![]() |
cf10ad7893 | ||
![]() |
edb8bd0a58 | ||
![]() |
605966fc32 | ||
![]() |
db1d3e4e8a | ||
![]() |
74bb708796 | ||
![]() |
3a8eecb023 | ||
![]() |
a689c01b0e | ||
![]() |
7a96f32c3f | ||
![]() |
867ca2ceaa | ||
![]() |
57be42182b | ||
![]() |
47e56badc4 | ||
![]() |
9d595d6087 | ||
![]() |
c4e17a1bc4 | ||
![]() |
3c9487541b | ||
![]() |
4a52399ec2 | ||
![]() |
c27c617d14 | ||
![]() |
764f0767c7 | ||
![]() |
fd8bca4d20 | ||
![]() |
52bfca57fb | ||
![]() |
5dfc140993 | ||
![]() |
50dde2a683 | ||
![]() |
8ada69cbcd | ||
![]() |
5aaedf0f19 | ||
![]() |
a03a0dd01e | ||
![]() |
5a04ec7c3c | ||
![]() |
718c2a57bd | ||
![]() |
5abd379edb | ||
![]() |
9e03657ec4 |
21 changed files with 77 additions and 34 deletions
10
Makefile
10
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
|
||||
|
@ -43,7 +43,7 @@ CSC_NAME ?=
|
|||
-include release.mk
|
||||
|
||||
setup:
|
||||
if [ ! -L "element-desktop/webapp" ]; then ./setup.sh; fi
|
||||
./setup.sh
|
||||
|
||||
element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset: $(wildcard element-desktop/build/SchildiChat.xcassets/SchildiChat.iconset/*)
|
||||
|
||||
|
@ -60,12 +60,8 @@ 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
|
||||
|
|
17
README.md
17
README.md
|
@ -15,6 +15,18 @@ 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
|
||||
|
||||
|
@ -36,10 +48,11 @@ Development happens in the `sc` branch, which might be **broken at any time**!
|
|||
|
||||
Since Debian is usually slow to update packages on its stable releases,
|
||||
some dependencies might not be recent enough to build SchildiChat.
|
||||
The following are the dependencies required to build SchildiChat Web/Desktop on Debian 10:
|
||||
The following are the dependencies required to build SchildiChat Web/Desktop on Debian 11 (bullseye):
|
||||
|
||||
```
|
||||
# apt install vim curl git make gcc g++ libsqlcipher-dev pkg-config libsecret-1-dev bsdtar
|
||||
# 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
|
||||
# apt install nodejs
|
||||
|
|
|
@ -17,4 +17,13 @@ forall_repos check_clean_git
|
|||
|
||||
bump_release_version
|
||||
|
||||
# Get version string
|
||||
get_current_versions
|
||||
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"
|
||||
|
||||
popd > /dev/null
|
||||
|
|
|
@ -17,4 +17,13 @@ forall_repos check_clean_git
|
|||
|
||||
bump_test_version
|
||||
|
||||
# Get version string
|
||||
get_current_versions
|
||||
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"
|
||||
|
||||
popd > /dev/null
|
||||
|
|
|
@ -27,11 +27,5 @@
|
|||
"text": "Privacy Policy"
|
||||
}
|
||||
],
|
||||
"sc_update_announcement_room": {
|
||||
"room_id_or_alias": "!JwTYjASnrfLEJQGQvt:matrix.org",
|
||||
"via_servers": [
|
||||
"supercable.onl",
|
||||
"spiritcroc.de"
|
||||
]
|
||||
}
|
||||
"map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
|
||||
}
|
||||
|
|
|
@ -21,6 +21,7 @@ git fetch
|
|||
git reset --hard origin/master
|
||||
|
||||
sed -i "s|^_pkgver=.*$|_pkgver=$version|" PKGBUILD
|
||||
sed -i "s|^pkgrel=.*$|pkgrel=1|" PKGBUILD
|
||||
sed -i "s|^sha256sums=('.*'$|sha256sums=('$sha256sum'|" PKGBUILD
|
||||
|
||||
makepkg --printsrcinfo > .SRCINFO
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 981210ca0ad0f837db9be9f4e2279abc162b6484
|
||||
Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9
|
|
@ -1 +1 @@
|
|||
Subproject commit 780759464826720559e78059f4bf8586a785bb47
|
||||
Subproject commit f87ee443e4be1d496a6034137660f53e6778d918
|
|
@ -1 +1,3 @@
|
|||
{}
|
||||
{
|
||||
"Show": "نشان دادن"
|
||||
}
|
||||
|
|
|
@ -40,5 +40,8 @@
|
|||
"Hide advanced theme settings": "Skrýt pokročilá nastavení motivu",
|
||||
"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é"
|
||||
"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",
|
||||
"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."
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
|
@ -39,5 +39,8 @@
|
|||
"Font size and typeface": "Font size and typeface",
|
||||
"Mark rooms as unread": "Allow marking chats as unread",
|
||||
"Mark as unread": "Mark as unread",
|
||||
"Mark as read": "Mark as read"
|
||||
"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."
|
||||
}
|
||||
|
|
|
@ -39,5 +39,8 @@
|
|||
"Intermediate: medium sized avatar with single-line preview": "Sedang: avatar sedang dengan tampilan satu baris",
|
||||
"Mark rooms as unread": "Perbolehkan menandai obrolan sebagai dibaca",
|
||||
"Mark as unread": "Tandai sebagai belum dibaca",
|
||||
"Mark as read": "Tandai sebagai dibaca"
|
||||
"Mark as read": "Tandai sebagai dibaca",
|
||||
"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."
|
||||
}
|
||||
|
|
|
@ -37,5 +37,8 @@
|
|||
"Compact: tiny avatar together with name and preview in one line": "Compacto: avatar minúsculo junto com o nome e visualização em uma linha",
|
||||
"Intermediate: medium sized avatar with single-line preview": "Intermédio: avatar de tamanho médio com visualização de uma linha",
|
||||
"Roomy: big avatar with two-line preview": "Amplo: grande avatar com visualização em duas linhas",
|
||||
"Room list style": "Estilo da lista de salas"
|
||||
"Room list style": "Estilo da lista de salas",
|
||||
"Mark rooms as unread": "Permitir markar conversas como não lidos",
|
||||
"Mark as unread": "Markar como não lido",
|
||||
"Mark as read": "Markar como lido"
|
||||
}
|
||||
|
|
|
@ -39,5 +39,8 @@
|
|||
"Room list style": "Rumslista stil",
|
||||
"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"
|
||||
"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",
|
||||
"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."
|
||||
}
|
||||
|
|
|
@ -36,5 +36,8 @@
|
|||
"Show message bubbles on one side only": "仅在一侧显示消息气泡",
|
||||
"Room list style": "聊天室列表样式",
|
||||
"Show message bubbles depending on the width either on both sides or only on one side": "根据窗口大小智能切换消息气泡的显示样式",
|
||||
"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),这将非常有用。"
|
||||
"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": "标记为未读"
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ pkgdesc="SchildiChat is a Matrix client based on Element with a more traditional
|
|||
arch=('x86_64')
|
||||
url="https://schildi.chat"
|
||||
license=('Apache')
|
||||
depends=('sqlcipher')
|
||||
depends=()
|
||||
provides=('---appName---')
|
||||
conflicts=('---appName---')
|
||||
source=("---debName---"
|
||||
|
@ -22,4 +22,5 @@ package() {
|
|||
msg2 "Extracting the data.tar.xz..."
|
||||
bsdtar -xf data.tar.xz -C "$pkgdir/"
|
||||
install -Dm755 "${srcdir}"/---appName---.sh "${pkgdir}"/usr/bin/---appName---
|
||||
sed -i 's|^Exec=.*|Exec=/usr/bin/---appName--- %u|' "${pkgdir}"/usr/share/applications/---appName---.desktop
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit b3aa5e524ea88940d37050ef2bd5c2d6bc029023
|
||||
Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2
|
|
@ -1 +1 @@
|
|||
Subproject commit 15b9ad85533136b11cfb70d269ba383ee55d898a
|
||||
Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb
|
|
@ -162,7 +162,8 @@ get_current_versions() {
|
|||
get_versions_string() {
|
||||
versions_string="${versions[0]}-sc.${versions[1]}"
|
||||
|
||||
if [[ ${versions[2]} -gt 0 ]]; then
|
||||
# both zero means the initial version after a merge
|
||||
if [[ ${versions[1]} -eq 0 || ${versions[2]} -gt 0 ]]; then
|
||||
versions_string+=".test.${versions[2]}"
|
||||
fi
|
||||
}
|
||||
|
@ -239,9 +240,6 @@ automatic_packagejson_adjustment() {
|
|||
local versions
|
||||
get_current_versions
|
||||
|
||||
# every build after a merge is a new test build
|
||||
versions[2]=$((versions[2] + 1))
|
||||
|
||||
forelement_repos apply_packagejson_overlay "package.json" "overlay-package.json"
|
||||
forelement_repos write_version "package.json"
|
||||
}
|
||||
|
|
|
@ -46,7 +46,7 @@ automatic_packagejson_adjustment
|
|||
|
||||
# Automatic theme update
|
||||
pushd "matrix-react-sdk" > /dev/null
|
||||
./theme.sh
|
||||
./theme.sh y
|
||||
popd > /dev/null
|
||||
|
||||
popd > /dev/null
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue