From d2afd04ac652bbe95862b5eb0285f615f0a5a5ab Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm1@gmail.com>
Date: Tue, 25 Sep 2018 09:35:14 -0500
Subject: [PATCH 1/4] Hide warning when using ssh

---
 scripts/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index a610e225..fd8963d1 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"

From 541924e96e673755d1958072e2a8c2caa7f994b1 Mon Sep 17 00:00:00 2001
From: mymindstorm <27789806+mymindstorm@users.noreply.github.com>
Date: Tue, 25 Sep 2018 14:37:30 -0500
Subject: [PATCH 2/4] Name CI stages

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b07ccbbe..5947cc98 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

From 3eeb99477cc95990145823ffdaf127bd9140707c Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm1@gmail.com>
Date: Tue, 25 Sep 2018 18:28:34 -0500
Subject: [PATCH 3/4] Add missing reference

---
 view/import.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/import.html b/view/import.html
index 0c193733..4a539762 100644
--- a/view/import.html
+++ b/view/import.html
@@ -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>

From 0edd6c5bc5b1880b6cc7e80029d80d92cbbeaa06 Mon Sep 17 00:00:00 2001
From: Brendan Early <mymindstorm1@gmail.com>
Date: Tue, 25 Sep 2018 18:31:47 -0500
Subject: [PATCH 4/4] 5.2.1

---
 edge-files/AppXManifest.xml | 4 ++--
 manifest-chrome.json        | 2 +-
 manifest-edge.json          | 2 +-
 manifest-firefox.json       | 2 +-
 view/import.html            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/edge-files/AppXManifest.xml b/edge-files/AppXManifest.xml
index c9e3f866..e5a614a7 100644
--- a/edge-files/AppXManifest.xml
+++ b/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>
\ No newline at end of file
+</Package>
diff --git a/manifest-chrome.json b/manifest-chrome.json
index a38a3082..592109c7 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 abcf12dd..2716bddd 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 367ed36c..d8a3c77f 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/view/import.html b/view/import.html
index 4a539762..47056782 100644
--- a/view/import.html
+++ b/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>