mirror of
https://github.com/SchildiChat/schildichat-desktop.git
synced 2025-06-22 18:13:04 +02:00
Compare commits
15 Commits
v1.11.6-sc
...
v1.11.15-s
Author | SHA1 | Date | |
---|---|---|---|
51e7d4b67b | |||
92ac040175 | |||
0bfa5733d5 | |||
b6fe959153 | |||
3c405aeaf6 | |||
e26d244c1e | |||
6bc26949c1 | |||
e22b6bb031 | |||
ae1e15dcef | |||
92599de20a | |||
c2318080eb | |||
b9d35c0cc1 | |||
77fbeb625c | |||
95d46b08b4 | |||
a7c084d6f8 |
@ -1,6 +1,11 @@
|
||||
{
|
||||
"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",
|
||||
"integrations_ui_url": "https://scalar.vector.im/",
|
||||
"integrations_rest_url": "https://scalar.vector.im/api",
|
||||
@ -14,7 +19,10 @@
|
||||
"showLabsSettings": true,
|
||||
"roomDirectory": {
|
||||
"servers": [
|
||||
"matrix.org"
|
||||
"matrix.org",
|
||||
"gitter.im",
|
||||
"libera.chat",
|
||||
"schildi.chat"
|
||||
]
|
||||
},
|
||||
"enable_presence_by_hs_url": {
|
||||
|
@ -20,8 +20,11 @@ debdate=$(date +%Y-%m-%d -r $debpath)
|
||||
pushd "$repopath" > /dev/null
|
||||
|
||||
git fetch
|
||||
git checkout master
|
||||
git reset --hard origin/master
|
||||
|
||||
git checkout -B "release-v$version"
|
||||
|
||||
yamlFile="chat.schildi.desktop.yaml"
|
||||
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 commit -m "Bump version to v$version"
|
||||
|
||||
git push
|
||||
git push -f --set-upstream origin "release-v$version"
|
||||
|
||||
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/"
|
||||
|
Submodule element-desktop updated: 66490633aa...dd74e36281
Submodule element-web updated: 8ed0e546a9...fcf043c998
@ -16,8 +16,8 @@ forall_repos check_branch $branch
|
||||
forall_repos check_clean_git
|
||||
|
||||
# Fetch upstream
|
||||
forall_repos git fetch origin > /dev/null
|
||||
forall_repos git fetch upstream > /dev/null
|
||||
forall_repos git fetch origin > /dev/null 2>/dev/null
|
||||
forall_repos git fetch upstream > /dev/null 2>/dev/null
|
||||
|
||||
(
|
||||
# Add new line below git log: https://unix.stackexchange.com/a/345558
|
||||
|
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": "常優先度"
|
||||
}
|
Submodule matrix-js-sdk updated: cb81a65097...6128de1baf
Submodule matrix-react-sdk updated: d140a7a094...0ad473a26d
Reference in New Issue
Block a user