diff --git a/.travis.yml b/.travis.yml index b07ccbbee..5947cc98a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,18 +7,22 @@ stages: jobs: include: - stage: test + name: "TS style check" script: "gts check" - stage: test + name: "lintspaces" script: "npm i -g lintspaces-cli && lintspaces -nt -d 'spaces' -i 'js-comments' src/* view/* manifest-*.json css/popup.css css/import.css" - stage: test + name: "Build Firefox and run addons-linter" script: "npm install --only=production addons-linter && npm run firefox && addons-linter firefox" - stage: test + name: "Build Chrome" script: "npm run chrome" - stage: test - # new i18n strings + name: "Process new i18n strings" script: bash scripts/i18n.sh if: branch = dev AND type != pull_request - stage: deploy - # release tagging + name: "Release tagging" script: bash scripts/tag.sh if: branch = release AND type != pull_request diff --git a/edge-files/AppXManifest.xml b/edge-files/AppXManifest.xml index c9e3f866d..e5a614a7b 100644 --- a/edge-files/AppXManifest.xml +++ b/edge-files/AppXManifest.xml @@ -8,7 +8,7 @@ + Version="5.2.1.0"/> Authenticator Extension @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/manifest-chrome.json b/manifest-chrome.json index a38a3082e..592109c7f 100644 --- a/manifest-chrome.json +++ b/manifest-chrome.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "__MSG_extShortName__", - "version": "5.2.0", + "version": "5.2.1", "default_locale": "en", "description": "__MSG_extDesc__", "icons": { diff --git a/manifest-edge.json b/manifest-edge.json index abcf12dd2..2716bddd0 100644 --- a/manifest-edge.json +++ b/manifest-edge.json @@ -56,7 +56,7 @@ "storage" ], "short_name": "__MSG_extShortName__", - "version": "5.2.0", + "version": "5.2.1", "web_accessible_resources": [ "view/qr.html", "images/scan.gif" diff --git a/manifest-firefox.json b/manifest-firefox.json index 367ed36c2..d8a3c77f7 100644 --- a/manifest-firefox.json +++ b/manifest-firefox.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "__MSG_extShortName__", - "version": "5.2.0", + "version": "5.2.1", "default_locale": "en", "description": "__MSG_extDesc__", "applications": { diff --git a/scripts/build.sh b/scripts/build.sh index a610e225a..fd8963d11 100644 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -32,7 +32,7 @@ if ! [[ $CREDS =~ $CREDREGEX ]] ; then echo -e "\e[7m\033[33mWarning: Missing info in credentials.ts\033[0m" fi -if ! [[ $REMOTE = *"https://github.com/Authenticator-Extension/Authenticator.git"* ]] ; then +if ! [[ $REMOTE = *"https://github.com/Authenticator-Extension/Authenticator.git"* || $REMOTE = *"git@github.com:Authenticator-Extension/Authenticator.git"* ]] ; then echo echo -e "\e[7m\033[33mNotice\033[0m" echo @@ -59,4 +59,4 @@ else cp manifest-$PLATFORM.json $PLATFORM/manifest.json fi -echo -e "\033[0;32mDone!\033[0m" \ No newline at end of file +echo -e "\033[0;32mDone!\033[0m" diff --git a/view/import.html b/view/import.html index 0c1937334..470567823 100644 --- a/view/import.html +++ b/view/import.html @@ -29,7 +29,7 @@ - {{ i18n.import_backup_file }} + {{ i18n.import_backup_file }} @@ -70,6 +70,7 @@ +