diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-10-05 07:33:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-05 07:33:42 +0800 |
| commit | ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd (patch) | |
| tree | 8ca772797be9b3481063c97ed1772b0902d657de | |
| parent | 4eafb7da2f2c6efdf5ae1530ff8301f0f7daa604 (diff) | |
| parent | 43dd3a5d7233338e82800d8e547c8c9113051423 (diff) | |
| download | tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.gz tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.bz2 tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.lz tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.xz tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.tar.zst tangerine-wallet-browser-ffe8ec2b89c8e5cec52475c9b59b60de2ef42efd.zip | |
Merge branch 'master' into SmallerCopiedButton
| -rw-r--r-- | app/images/icon-32.png | bin | 0 -> 1730 bytes | |||
| -rw-r--r-- | app/images/icon-64.png | bin | 0 -> 3573 bytes | |||
| -rw-r--r-- | app/manifest.json | 5 | ||||
| -rw-r--r-- | development/announcer.js | 12 | ||||
| -rw-r--r-- | package.json | 3 |
5 files changed, 17 insertions, 3 deletions
diff --git a/app/images/icon-32.png b/app/images/icon-32.png Binary files differnew file mode 100644 index 000000000..f801ebb6b --- /dev/null +++ b/app/images/icon-32.png diff --git a/app/images/icon-64.png b/app/images/icon-64.png Binary files differnew file mode 100644 index 000000000..b3019ad65 --- /dev/null +++ b/app/images/icon-64.png diff --git a/app/manifest.json b/app/manifest.json index d6738a5fa..6f0eacf77 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/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 b59a7ca44..72c682173 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": [ |
