Compare commits

..

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

14 changed files with 16 additions and 39 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,5 @@ 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

View file

@ -24,6 +24,5 @@ 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

@ -1 +1 @@
Subproject commit e8271ec368dea7b706f072b83171f8db1bc548c9
Subproject commit 592337db774fe9fd186243d3eaac1780229b459d

@ -1 +1 @@
Subproject commit f87ee443e4be1d496a6034137660f53e6778d918
Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030

View file

@ -40,8 +40,5 @@
"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é",
"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."
"Mark as read": "Označit jako přečtené"
}

View file

@ -141,7 +141,5 @@
"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",
"Enable YouTube embed player": "Eingebetteten YouTube-Player aktivieren",
"Collapse additional buttons": "Zusätzliche Buttons einklappen"
"Mark as unread": "Als ungelesen markieren"
}

View file

@ -40,7 +40,5 @@
"Mark rooms as unread": "Allow marking chats as unread",
"Mark as unread": "Mark as unread",
"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."
"Enable YouTube embed player": "Enable YouTube embed player"
}

View file

@ -39,8 +39,5 @@
"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",
"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."
"Mark as read": "Tandai sebagai dibaca"
}

View file

@ -39,8 +39,5 @@
"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",
"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."
"Mark rooms as unread": "Tillåt att chattar markeras som olästa"
}

View file

@ -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=()
depends=('sqlcipher')
provides=('---appName---')
conflicts=('---appName---')
source=("---debName---"

@ -1 +1 @@
Subproject commit c696abff7507dfce8e94a6db14a4b4693895b0e2
Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a

@ -1 +1 @@
Subproject commit 8245acd053cb8fcbe8789d43afe70204a15a1deb
Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb