mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-07-04 06:22:21 +02:00
Compare commits
12 commits
v1.11.8-sc
...
v1.11.15-s
Author | SHA1 | Date | |
---|---|---|---|
![]() |
51e7d4b67b | ||
![]() |
92ac040175 | ||
![]() |
0bfa5733d5 | ||
![]() |
b6fe959153 | ||
![]() |
3c405aeaf6 | ||
![]() |
e26d244c1e | ||
![]() |
6bc26949c1 | ||
![]() |
e22b6bb031 | ||
![]() |
ae1e15dcef | ||
![]() |
92599de20a | ||
![]() |
c2318080eb | ||
![]() |
b9d35c0cc1 |
9 changed files with 24 additions and 8 deletions
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
"update_base_url": null,
|
"update_base_url": null,
|
||||||
"default_server_name": "matrix.org",
|
"default_server_config": {
|
||||||
|
"m.homeserver": {
|
||||||
|
"base_url": "https://matrix-client.matrix.org",
|
||||||
|
"server_name": "matrix.org"
|
||||||
|
}
|
||||||
|
},
|
||||||
"brand": "SchildiChat",
|
"brand": "SchildiChat",
|
||||||
"integrations_ui_url": "https://scalar.vector.im/",
|
"integrations_ui_url": "https://scalar.vector.im/",
|
||||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||||
|
@ -14,7 +19,10 @@
|
||||||
"showLabsSettings": true,
|
"showLabsSettings": true,
|
||||||
"roomDirectory": {
|
"roomDirectory": {
|
||||||
"servers": [
|
"servers": [
|
||||||
"matrix.org"
|
"matrix.org",
|
||||||
|
"gitter.im",
|
||||||
|
"libera.chat",
|
||||||
|
"schildi.chat"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"enable_presence_by_hs_url": {
|
"enable_presence_by_hs_url": {
|
||||||
|
|
|
@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath)
|
||||||
pushd "$repopath" > /dev/null
|
pushd "$repopath" > /dev/null
|
||||||
|
|
||||||
git fetch
|
git fetch
|
||||||
|
git checkout master
|
||||||
git reset --hard origin/master
|
git reset --hard origin/master
|
||||||
|
|
||||||
|
git checkout -B "release-v$version"
|
||||||
|
|
||||||
yamlFile="chat.schildi.desktop.yaml"
|
yamlFile="chat.schildi.desktop.yaml"
|
||||||
xmlFile="chat.schildi.desktop.metainfo.xml"
|
xmlFile="chat.schildi.desktop.metainfo.xml"
|
||||||
|
|
||||||
|
@ -33,8 +36,8 @@ sed -i "s|^\s\s<releases>$| <releases>\n <release version=\"$version\" date=
|
||||||
git add $yamlFile $xmlFile
|
git add $yamlFile $xmlFile
|
||||||
git commit -m "Bump version to v$version"
|
git commit -m "Bump version to v$version"
|
||||||
|
|
||||||
git push
|
git push -f --set-upstream origin "release-v$version"
|
||||||
|
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
|
|
||||||
echo "Release v$version published on flathub!"
|
echo "Release v$version published on flathub, now merge that branch as PR: https://github.com/flathub/chat.schildi.desktop/"
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 0be4f8fcb49e4c0c66f3b63c69cb91711092f461
|
Subproject commit dd74e3628176f0ad39097325e5603fec51408a83
|
|
@ -1 +1 @@
|
||||||
Subproject commit ef58800f2c6c1d47501cbd4628fdef67aaf7a5ca
|
Subproject commit fcf043c9989b995aee64322ac5e7ff3997da535d
|
1
i18n-overlays/element-desktop/ja.json
Normal file
1
i18n-overlays/element-desktop/ja.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{}
|
1
i18n-overlays/element-web/ja.json
Normal file
1
i18n-overlays/element-web/ja.json
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{}
|
3
i18n-overlays/matrix-react-sdk/ja.json
Normal file
3
i18n-overlays/matrix-react-sdk/ja.json
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"Normal priority": "常優先度"
|
||||||
|
}
|
|
@ -1 +1 @@
|
||||||
Subproject commit c2f77957a32ff3ce7ead38aa483aa34b827423db
|
Subproject commit 6128de1bafde5b2112f2fe6dd2101e822d2c0636
|
|
@ -1 +1 @@
|
||||||
Subproject commit 0d5ad44950f5a637813c2fc3fcc3e24426dbba4b
|
Subproject commit 0ad473a26dae2d37138e46024462b599ae67285e
|
Loading…
Add table
Add a link
Reference in a new issue