m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge branch 'master' into i743-FixDelegateCallFlag

Browse Source
This commit is contained in:
Kevin Serrano 2016-10-18 14:20:16 -07:00 committed by GitHub
commit 82489129d5
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,12 +2,16 @@
## Current Master ## Current Master
## 2.13.5 2016-10-18
- Increase default max gas to `100000` over the RPC's `estimateGas` response. - Increase default max gas to `100000` over the RPC's `estimateGas` response.
- Fix bug where slow-loading dapps would sometimes trigger infinite reload loops.
## 2.13.4 2016-10-17 ## 2.13.4 2016-10-17
- Add custom transaction fee field to send form. - Add custom transaction fee field to send form.
- Fix bug where web3 was being injected into XML files. - Fix bug where web3 was being injected into XML files.
- Fix bug where changing network would not reload current Dapps.
## 2.13.3 2016-10-4 ## 2.13.3 2016-10-4

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "MetaMask", "name": "MetaMask",
"short_name": "Metamask", "short_name": "Metamask",
"version": "2.13.4", "version": "2.13.5",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "Ethereum Browser Extension", "description": "Ethereum Browser Extension",

2
app/scripts/inpage.js
View File

@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload)
var pingChannel = inpageProvider.multiStream.createStream('pingpong') var pingChannel = inpageProvider.multiStream.createStream('pingpong')
var pingStream = new PingStream({ objectMode: true }) var pingStream = new PingStream({ objectMode: true })
// wait for first successful reponse // wait for first successful reponse
metamaskStream.once('data', function(){ metamaskStream.once('_data', function(){
pingStream.pipe(pingChannel).pipe(pingStream) pingStream.pipe(pingChannel).pipe(pingStream)
}) })
endOfStream(pingStream, triggerReload) endOfStream(pingStream, triggerReload)

2
package.json
View File

@ -7,7 +7,7 @@
"start": "gulp dev", "start": "gulp dev",
"lint": "gulp lint", "lint": "gulp lint",
"dev": "gulp dev", "dev": "gulp dev",
"dist": "gulp dist", "dist": "gulp dist --disableLiveReload",
"test": "npm run fastTest && npm run ci && npm run lint", "test": "npm run fastTest && npm run ci && npm run lint",
"fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"", "fastTest": "mocha --require test/helper.js --compilers js:babel-register --recursive \"test/unit/**/*.js\"",
"watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"", "watch": "mocha watch --compilers js:babel-register --recursive \"test/unit/**/*.js\"",