From 71549ffb993904d5d7feb69f9850d0d6169eb64f Mon Sep 17 00:00:00 2001 From: Sydyk Date: Fri, 12 Apr 2019 17:06:03 +0600 Subject: [PATCH] Added GW transfer button --- bower.json | 2 +- chrome/manifest.json | 4 +-- common/res/defaults.json | 2 +- common/ui/_popup-generate-key.html | 2 +- common/ui/_popup-show-gw-data.html | 4 +-- common/ui/keys.html | 9 ++++- common/ui/keys.js | 10 ++++++ dist/.gitignore | 2 -- e2e-plugin.safariextension/Info.plist | 6 ++-- edge/Extension/manifest.json | 4 +-- edge/appxmanifest.xml | 2 +- firefox/manifest.json | 2 +- package-lock.json | 47 ++++++++------------------- package.json | 2 +- 14 files changed, 47 insertions(+), 51 deletions(-) delete mode 100755 dist/.gitignore diff --git a/bower.json b/bower.json index ef9fe19..fbe99c0 100755 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "porto", - "version": "6.0.0", + "version": "6.0.1", "description": "Porto is a browser extension library for Google Chrome,Firefox and Safari that allows to develop cross platform browser extension with ease.", "license": "ALS", "private": true, diff --git a/chrome/manifest.json b/chrome/manifest.json index c9e0267..f01f122 100755 --- a/chrome/manifest.json +++ b/chrome/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_ext_name__", - "version": "6.0.0", - "version_name": "6.0.0", + "version": "6.0.1", + "version_name": "6.0.1", "description": "__MSG_ext_description__", "homepage_url":"https://subutai.io", "manifest_version": 2, diff --git a/common/res/defaults.json b/common/res/defaults.json index e84aedd..145bce7 100755 --- a/common/res/defaults.json +++ b/common/res/defaults.json @@ -1,5 +1,5 @@ { - "version": "6.0.0", + "version": "6.0.1", "watch_list": [ { "active": true, diff --git a/common/ui/_popup-generate-key.html b/common/ui/_popup-generate-key.html index bac6d5a..ef94e7a 100755 --- a/common/ui/_popup-generate-key.html +++ b/common/ui/_popup-generate-key.html @@ -29,7 +29,7 @@
+ placeholder="Confirm password" >
diff --git a/common/ui/_popup-show-gw-data.html b/common/ui/_popup-show-gw-data.html index 92d2ad2..00c1cc3 100644 --- a/common/ui/_popup-show-gw-data.html +++ b/common/ui/_popup-show-gw-data.html @@ -1,7 +1,7 @@
- GoodWill info + GoodWill Information @@ -10,7 +10,7 @@
- +
diff --git a/common/ui/keys.html b/common/ui/keys.html index 0906229..cf2a6dc 100755 --- a/common/ui/keys.html +++ b/common/ui/keys.html @@ -92,6 +92,13 @@

Accounts

+ +
+ + + +
+
@@ -105,7 +112,7 @@

Accounts

Peers Export Information - GW Information + GoodWill Information Delete diff --git a/common/ui/keys.js b/common/ui/keys.js index 8c184d5..761b53f 100755 --- a/common/ui/keys.js +++ b/common/ui/keys.js @@ -106,6 +106,8 @@ var options = options || null; buttonsStyling: false }, function (isConfirm) { if (isConfirm) { + + swal2.disableButtons(); triggerGenerate(); } @@ -166,7 +168,15 @@ var options = options || null; exists = true; break; } + }; + + if (parameters.passphrase === ""){ + $("#error-msg").text("Password can not be empty."); + $("#error-msg").show(); + swal2.enableButtons(); + return; } + var errorMsgEmail = $("#error-msg"); if (exists) { errorMsgEmail.text("Email already exists."); diff --git a/dist/.gitignore b/dist/.gitignore deleted file mode 100755 index 6044a4a..0000000 --- a/dist/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -e2e-plugin* -*.xpi diff --git a/e2e-plugin.safariextension/Info.plist b/e2e-plugin.safariextension/Info.plist index 8492274..76991ec 100755 --- a/e2e-plugin.safariextension/Info.plist +++ b/e2e-plugin.safariextension/Info.plist @@ -11,11 +11,11 @@ CFBundleIdentifier io.subutai.tooling.e2eplugin.sfx CFBundleInfoDictionaryVersion - 6.0 + 6.0.1 CFBundleShortVersionString - 6.0.0 + 6.0.1 CFBundleVersion - 6.0.0 + 6.0.1 Chrome Global Page diff --git a/edge/Extension/manifest.json b/edge/Extension/manifest.json index 41f9f77..637b6c2 100644 --- a/edge/Extension/manifest.json +++ b/edge/Extension/manifest.json @@ -1,8 +1,8 @@ { "name": "Subutai E2E Plugin", "author": "Subutai Tooling", - "version": "6.0.0", - "version_name": "6.0.0", + "version": "6.0.1", + "version_name": "6.0.1", "description": "Effortlessly secure the doors to your Subutai Cloud", "homepage_url":"https://subutai.io", "manifest_version": 2, diff --git a/edge/appxmanifest.xml b/edge/appxmanifest.xml index e11331f..132056d 100644 --- a/edge/appxmanifest.xml +++ b/edge/appxmanifest.xml @@ -7,7 +7,7 @@ + Version="6.0.1" /> Subutai E2E Plugin diff --git a/firefox/manifest.json b/firefox/manifest.json index 65ee57d..83c77af 100644 --- a/firefox/manifest.json +++ b/firefox/manifest.json @@ -6,7 +6,7 @@ } }, "name": "__MSG_ext_name__", - "version": "6.0.0", + "version": "6.0.1", "description": "__MSG_ext_description__", "homepage_url":"https://subutai.io", "manifest_version": 2, diff --git a/package-lock.json b/package-lock.json index 34ecd8b..3aaaa75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "subutai", - "version": "6.0.0", + "version": "6.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1255,8 +1255,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -1277,14 +1276,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1299,20 +1296,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -1429,8 +1423,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -1442,7 +1435,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1457,7 +1449,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1465,14 +1456,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1491,7 +1480,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -1572,8 +1560,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -1585,7 +1572,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -1671,8 +1657,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -1708,7 +1693,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1728,7 +1712,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1772,14 +1755,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -5924,11 +5905,11 @@ "requires": { "async": "0.1.22", "catharsis": "0.7.0", - "crypto-browserify": "git+https://github.com/dominictarr/crypto-browserify.git#95c5d505", + "crypto-browserify": "git+https://github.com/dominictarr/crypto-browserify.git#95c5d50581ce0b4fff6e76e45dc0bb3622be4e9a", "js2xmlparser": "0.1.0", "jshint": "0.9.1", "marked": "0.2.8", - "taffydb": "git+https://github.com/hegemonic/taffydb.git", + "taffydb": "git+https://github.com/hegemonic/taffydb.git#e41b5e179e197bb85c5fb887b707672b1e5ca079", "underscore": "1.4.2", "wrench": "1.3.9" }, diff --git a/package.json b/package.json index 5f4ea16..b003c7b 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "subutai", - "version": "6.0.0", + "version": "6.0.1", "description": "Subutai E2E Plugin", "scripts": { "test": "grunt test"