Compare commits

..

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

11 changed files with 15 additions and 26 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,8 +60,12 @@ 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

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

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 64d9fadbbeae8e109d237d185e2c865a63004a83
Subproject commit c9dd12d9c3140f6a64f1b0ded8d6cf71d9f49b1b

@ -1 +1 @@
Subproject commit 9bd6ec343318a5056bcc4becfdc738d5727a277d
Subproject commit abdb37049f0a464e6b78f41aee3e0f83601d0755

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

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

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