1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-22 09:57:02 +01:00

Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3

This commit is contained in:
kumavis 2016-10-05 07:22:51 -07:00
commit ea4946ab3a
8 changed files with 21 additions and 4 deletions

View File

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

BIN
app/images/icon-32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/images/icon-64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@ -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": [

View File

@ -1,5 +1,5 @@
const extension = require('./extension')
const height = 500
const height = 520
const width = 360
const notifications = {

12
development/announcer.js Normal file
View File

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

View File

@ -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": [

View File

@ -61,6 +61,7 @@ CreateVaultCompleteScreen.prototype.render = function () {
onClick: () => this.confirmSeedWords(),
style: {
margin: '24px',
fontSize: '0.9em',
},
}, 'I\'ve copied it somewhere safe'),
])