aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-10-05 22:22:51 +0800
committerkumavis <aaron@kumavis.me>2016-10-05 22:22:51 +0800
commitea4946ab3affde3dc85fda17448209cb934cc667 (patch)
tree9aad77092f453a82ecf71c92a4d72cc7ef597588
parent6ee22e66884d993413dd4fb6e0f76ed2e5386810 (diff)
parente5bf957242b1d443ef15b588340dba1a5e34b92a (diff)
downloadtangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.gz
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.tar.zst
tangerine-wallet-browser-ea4946ab3affde3dc85fda17448209cb934cc667.zip
Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3
-rw-r--r--CHANGELOG.md2
-rw-r--r--app/images/icon-32.pngbin0 -> 1730 bytes
-rw-r--r--app/images/icon-64.pngbin0 -> 3573 bytes
-rw-r--r--app/manifest.json5
-rw-r--r--app/scripts/lib/notifications.js2
-rw-r--r--development/announcer.js12
-rw-r--r--package.json3
-rw-r--r--ui/app/first-time/create-vault-complete.js1
8 files changed, 21 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 946e45177..cd1d682ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
## 2.13.3 2016-10-4
- Fix bug where log queries were filtered out.
+- Decreased vault confirmation button font size to help some Linux users who could not see it.
+- Made popup a little taller because it would sometimes cut off buttons.
## 2.13.2 2016-10-4
diff --git a/app/images/icon-32.png b/app/images/icon-32.png
new file mode 100644
index 000000000..f801ebb6b
--- /dev/null
+++ b/app/images/icon-32.png
Binary files differ
diff --git a/app/images/icon-64.png b/app/images/icon-64.png
new file mode 100644
index 000000000..b3019ad65
--- /dev/null
+++ b/app/images/icon-64.png
Binary files differ
diff --git a/app/manifest.json b/app/manifest.json
index f5d08709a..badeb7cb2 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -10,7 +10,7 @@
"suggested_key": {
"windows": "Alt+Shift+M",
"mac": "Alt+Shift+M",
- "chromeos": "Search+M",
+ "chromeos": "Alt+Shift+M",
"linux": "Alt+Shift+M"
}
}
@@ -55,9 +55,10 @@
}
],
"permissions": [
- "notifications",
"storage",
"tabs",
+ "clipboardWrite",
+ "clipboardRead",
"http://localhost:8545/"
],
"web_accessible_resources": [
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 422f46f6d..cd7535232 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -1,5 +1,5 @@
const extension = require('./extension')
-const height = 500
+const height = 520
const width = 360
const notifications = {
diff --git a/development/announcer.js b/development/announcer.js
new file mode 100644
index 000000000..8939244d3
--- /dev/null
+++ b/development/announcer.js
@@ -0,0 +1,12 @@
+var manifest = require('../app/manifest.json')
+var version = manifest.version
+
+var fs = require('fs')
+var path = require('path')
+var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toString()
+
+var log = changelog.split(version)[1].split('##')[0].trim()
+
+let msg = `**MetaMask ${version}** now published to the Chrome Store! It should be available over the next hour!\n${log}`
+
+console.log(msg)
diff --git a/package.json b/package.json
index 3af949b4e..50c85f0af 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,8 @@
"mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"buildMock": "browserify ./mock-dev.js -o ./development/bundle.js",
"testem": "npm run buildMock && testem",
- "ci": "npm run buildMock && testem ci -P 2"
+ "ci": "npm run buildMock && testem ci -P 2",
+ "announce": "node development/announcer.js"
},
"browserify": {
"transform": [
diff --git a/ui/app/first-time/create-vault-complete.js b/ui/app/first-time/create-vault-complete.js
index 0ca0a1b22..2b5413955 100644
--- a/ui/app/first-time/create-vault-complete.js
+++ b/ui/app/first-time/create-vault-complete.js
@@ -61,6 +61,7 @@ CreateVaultCompleteScreen.prototype.render = function () {
onClick: () => this.confirmSeedWords(),
style: {
margin: '24px',
+ fontSize: '0.9em',
},
}, 'I\'ve copied it somewhere safe'),
])