Merge pull request #211 from Authenticator-Extension/dev

5.2.1

Author: mymindstorm

.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

edge-files/AppXManifest.xml

@@ -8,7 +8,7 @@
   <Identity
     Name="2184mymindstorm.AuthenticatorExtension"
     Publisher="CN=A72AD439-2119-4B82-B629-3302B9AF8944"
-    Version="5.2.0.0"/>
+    Version="5.2.1.0"/>
 
   <Properties>
     <DisplayName>Authenticator Extension</DisplayName>
@@ -62,4 +62,4 @@
 	  </Extensions>
  </Application>
 </Applications>
-</Package>
+</Package>

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": {

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"

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": {

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 = *"[email protected]: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"
+echo -e "\033[0;32mDone!\033[0m"

view/import.html

@@ -29,7 +29,7 @@
         </div>
         <div v-show="importType === 'import_file'">
             <div class="import_file" v-if="!getFilePassphrase">
-                <label for="import_file" style="">{{ i18n.import_backup_file }}</label>
+                <label for="import_file">{{ i18n.import_backup_file }}</label>
                 <input id="import_file" type="file" v-on:change="importFile($event, true)" accept="application/json"></input>
             </div>
             <div class="import_file_passphrase" v-else>
@@ -70,6 +70,7 @@
 <script src="../build/ui/passphrase.js"></script>
 <script src="../build/ui/qr.js"></script>
 <script src="../build/ui/ui.js"></script>
+<script src="../build/ui/backup.js"></script>
 <script src="../build/popup.js"></script>
 </body>
 </html>