diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 8fe5bdbdc..dcb6b8c4c 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -2,6 +2,5 @@ - - \ No newline at end of file + diff --git a/bin/release.sh b/bin/release.sh index 80a53f771..78237077c 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -55,47 +55,20 @@ echo "Creating release in GitHub" EXTRA= if [[ $TAG == *"beta"* ]]; then - EXTRA=--pre-release + EXTRA=--prerelease fi -github-release release \ - --tag $TAG \ - --name "$TAG release" $EXTRA +echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token -echo "Uploading debian x64 package" - -github-release upload \ - --tag $TAG \ - --name "$DEBIAN_X64_BUILD" \ - --file "dist/$DEBIAN_X64_BUILD" - -echo "Uploading linux x64 build" - -github-release upload \ - --tag $TAG \ - --name "$LINUX_X64_BUILD" \ - --file "dist/$LINUX_X64_BUILD" - -echo "Uploading windows x64 build" - -github-release upload \ - --tag $TAG \ - --name "$WINDOWS_X64_BUILD" \ - --file "dist/$WINDOWS_X64_BUILD" - -echo "Uploading mac x64 build" - -github-release upload \ - --tag $TAG \ - --name "$MAC_X64_BUILD" \ - --file "dist/$MAC_X64_BUILD" - -echo "Uploading linux x64 server build" - -github-release upload \ - --tag $TAG \ - --name "$SERVER_BUILD" \ - --file "dist/$SERVER_BUILD" +gh release create "$TAG" \ + --title "$TAG release" \ + --notes "" + $EXTRA \ + "dist/$DEBIAN_X64_BUILD" \ + "dist/$LINUX_X64_BUILD" \ + "dist/$WINDOWS_X64_BUILD" \ + "dist/$MAC_X64_BUILD" \ + "dist/$SERVER_BUILD" echo "Building docker image" @@ -105,4 +78,4 @@ echo "Pushing docker image to dockerhub" bin/push-docker-image.sh $VERSION -echo "Release finished!" \ No newline at end of file +echo "Release finished!" diff --git a/src/public/app/widgets/search_actions/delete_note.js b/src/public/app/widgets/search_actions/delete_note.js index 9de251a4d..9e996dd4d 100644 --- a/src/public/app/widgets/search_actions/delete_note.js +++ b/src/public/app/widgets/search_actions/delete_note.js @@ -5,7 +5,7 @@ const TPL = ` - Delete matched note + Delete matched notes