Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.2.1 #211

Merged
merged 5 commits into from
Sep 25, 2018
Merged

5.2.1 #211

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions edge-files/AppXManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -62,4 +62,4 @@
</Extensions>
</Application>
</Applications>
</Package>
</Package>
2 changes: 1 addition & 1 deletion manifest-chrome.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion manifest-edge.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manifest-firefox.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
3 changes: 2 additions & 1 deletion view/import.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>