Merge branch 'master' into SmallerCopiedButton

feature/default_network_editable
kumavis 8 years ago committed by GitHub
commit ffe8ec2b89
  1. BIN
      app/images/icon-32.png
  2. BIN
      app/images/icon-64.png
  3. 5
      app/manifest.json
  4. 12
      development/announcer.js
  5. 3
      package.json

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

@ -10,7 +10,7 @@
"suggested_key": { "suggested_key": {
"windows": "Alt+Shift+M", "windows": "Alt+Shift+M",
"mac": "Alt+Shift+M", "mac": "Alt+Shift+M",
"chromeos": "Search+M", "chromeos": "Alt+Shift+M",
"linux": "Alt+Shift+M" "linux": "Alt+Shift+M"
} }
} }
@ -55,9 +55,10 @@
} }
], ],
"permissions": [ "permissions": [
"notifications",
"storage", "storage",
"tabs", "tabs",
"clipboardWrite",
"clipboardRead",
"http://localhost:8545/" "http://localhost:8545/"
], ],
"web_accessible_resources": [ "web_accessible_resources": [

@ -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)

@ -15,7 +15,8 @@
"mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
"buildMock": "browserify ./mock-dev.js -o ./development/bundle.js", "buildMock": "browserify ./mock-dev.js -o ./development/bundle.js",
"testem": "npm run buildMock && testem", "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": { "browserify": {
"transform": [ "transform": [

Loading…
Cancel
Save