Compare commits

..

No commits in common. "v1.10.13-sc.0.test.1" and "v1.10.8-sc.0.test.2" have entirely different histories.

12 changed files with 17 additions and 32 deletions

View file

@ -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,14 +60,17 @@ 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
export SQLCIPHER_STATIC=1
$(YARN) --cwd element-desktop run fetch --cfgdir ''
$(YARN) --cwd element-desktop run build:native

View file

@ -15,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
@ -51,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

View file

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

View file

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

@ -1 +1 @@
Subproject commit 9a0192067b4003f063806bb524930b0650524a97
Subproject commit 49a4a41a1b035cc56ca3d408b3196dc8b84a2262

@ -1 +1 @@
Subproject commit 89ae4928129936ce7ba96675e7c5cac07dae19d5
Subproject commit a92f68d167f96b8cc38360dbe4c9862289af88ff

View file

@ -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",
"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."
"Collapse additional buttons": "Sbalit další tlačítka"
}

View file

@ -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",
"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."
"Collapse additional buttons": "Sembunyikan tombol tambahan"
}

View file

@ -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",
"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."
"Collapse additional buttons": "Dölj ytterligare knappar"
}

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 4a5ee08063d1e48aa707a2898675168cc3c176db
Subproject commit 9faf86220bff4224c2189225580c1e7efec636dd

@ -1 +1 @@
Subproject commit 255e6180a278d336373fafcec1cc409453bc070e
Subproject commit c7ea457e90d0f27ee05feaaa2bcc123a69046f60