mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-07-02 21:50:04 +02:00
Compare commits
23 commits
v1.9.7-sc.
...
v1.10.4-sc
Author | SHA1 | Date | |
---|---|---|---|
![]() |
c655803783 | ||
![]() |
cf10ad7893 | ||
![]() |
edb8bd0a58 | ||
![]() |
605966fc32 | ||
![]() |
db1d3e4e8a | ||
![]() |
74bb708796 | ||
![]() |
3a8eecb023 | ||
![]() |
a689c01b0e | ||
![]() |
7a96f32c3f | ||
![]() |
867ca2ceaa | ||
![]() |
57be42182b | ||
![]() |
47e56badc4 | ||
![]() |
9d595d6087 | ||
![]() |
c4e17a1bc4 | ||
![]() |
3c9487541b | ||
![]() |
4a52399ec2 | ||
![]() |
c27c617d14 | ||
![]() |
764f0767c7 | ||
![]() |
fd8bca4d20 | ||
![]() |
52bfca57fb | ||
![]() |
5dfc140993 | ||
![]() |
50dde2a683 | ||
![]() |
8ada69cbcd |
15 changed files with 36 additions and 20 deletions
2
Makefile
2
Makefile
|
@ -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/*)
|
||||
|
||||
|
|
|
@ -17,4 +17,12 @@ 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"
|
||||
|
||||
popd > /dev/null
|
||||
|
|
|
@ -17,4 +17,12 @@ 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"
|
||||
|
||||
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 a074ede0c13c09dca96a9be2c60d3c4e5c03a234
|
||||
Subproject commit 592337db774fe9fd186243d3eaac1780229b459d
|
|
@ -1 +1 @@
|
|||
Subproject commit 94895dee0a29a517919b8ba7461982baf11139cc
|
||||
Subproject commit f64fa1ed9a746f60d5b96f7dd6d6275ef4913030
|
|
@ -1 +1,3 @@
|
|||
{}
|
||||
{
|
||||
"Show": "نشان دادن"
|
||||
}
|
||||
|
|
|
@ -39,5 +39,6 @@
|
|||
"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"
|
||||
}
|
||||
|
|
|
@ -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"
|
||||
}
|
||||
|
|
|
@ -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 09fc7b8ff4035e92821d264e807441f9d4e9da85
|
||||
Subproject commit 07619ca6070dc3efa5e29208c2f3cfcc29b7fd3a
|
|
@ -1 +1 @@
|
|||
Subproject commit 2fd5a9616e11a138d859e0a30e81e5d9d185f77f
|
||||
Subproject commit b61680864ed3442b3f6118c1a5450ab0bc6d2cfb
|
|
@ -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