diff --git a/deploy/update-flathub.sh b/deploy/update-flathub.sh index 31c4ce5..7451aec 100755 --- a/deploy/update-flathub.sh +++ b/deploy/update-flathub.sh @@ -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$| \n /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/" diff --git a/element-desktop b/element-desktop index e8138b9..07d1283 160000 --- a/element-desktop +++ b/element-desktop @@ -1 +1 @@ -Subproject commit e8138b904e656a28f0a2ad260f3ab9f5d85af401 +Subproject commit 07d1283f2388a1c748f6d5848740730ad6b7ee00 diff --git a/element-web b/element-web index ed7c271..d7e4930 160000 --- a/element-web +++ b/element-web @@ -1 +1 @@ -Subproject commit ed7c271bc8028760639bdee69387bc58956c556b +Subproject commit d7e4930ab4efced752493957b37c1afb0aeb9d0b diff --git a/generate_changelog.sh b/generate_changelog.sh index 3bca794..1e65601 100755 --- a/generate_changelog.sh +++ b/generate_changelog.sh @@ -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 diff --git a/i18n-overlays/element-desktop/ja.json b/i18n-overlays/element-desktop/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-desktop/ja.json @@ -0,0 +1 @@ +{} diff --git a/i18n-overlays/element-web/ja.json b/i18n-overlays/element-web/ja.json new file mode 100644 index 0000000..0967ef4 --- /dev/null +++ b/i18n-overlays/element-web/ja.json @@ -0,0 +1 @@ +{} diff --git a/i18n-overlays/matrix-react-sdk/ja.json b/i18n-overlays/matrix-react-sdk/ja.json new file mode 100644 index 0000000..fedc533 --- /dev/null +++ b/i18n-overlays/matrix-react-sdk/ja.json @@ -0,0 +1,3 @@ +{ + "Normal priority": "常優先度" +} diff --git a/matrix-js-sdk b/matrix-js-sdk index cb81a65..1474204 160000 --- a/matrix-js-sdk +++ b/matrix-js-sdk @@ -1 +1 @@ -Subproject commit cb81a65097a0bb861da9e7384cb7469ed42e7a58 +Subproject commit 14742043de61ac9844c78204ffb93a783fa2c676 diff --git a/matrix-react-sdk b/matrix-react-sdk index a8c4ff4..c9fb6bb 160000 --- a/matrix-react-sdk +++ b/matrix-react-sdk @@ -1 +1 @@ -Subproject commit a8c4ff42459a33610b1cba4105b9cdc4f52eaa64 +Subproject commit c9fb6bbbb8bf97802277127601163618669acdee