diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-10-20 06:25:27 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-10-20 06:25:27 +0800 |
| commit | 2f7ce1ca4cd7c5a953e584434049cf409437c8e3 (patch) | |
| tree | 08c230826b33af8558a3065794de960e1bdc8cdb | |
| parent | 4366f72fe1d9f0c3a94f27e5f23bd826f8cf69e0 (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.gz tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.bz2 tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.lz tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.xz tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.tar.zst tangerine-wallet-browser-2f7ce1ca4cd7c5a953e584434049cf409437c8e3.zip | |
Merge branch 'master' into i#741
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/inpage.js | 2 | ||||
| -rw-r--r-- | package.json | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index db876e5ad..738acb6c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,16 @@ ## Current Master - Add a check for improper Transaction data. +## 2.13.5 2016-10-18 + - 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 - Add custom transaction fee field to send form. - 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 diff --git a/app/manifest.json b/app/manifest.json index cbce01468..8f5a34ea6 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "2.13.4", + "version": "2.13.5", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index ef199946c..85dd70b4d 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -43,7 +43,7 @@ reloadStream.once('data', triggerReload) var pingChannel = inpageProvider.multiStream.createStream('pingpong') var pingStream = new PingStream({ objectMode: true }) // wait for first successful reponse -metamaskStream.once('data', function(){ +metamaskStream.once('_data', function(){ pingStream.pipe(pingChannel).pipe(pingStream) }) endOfStream(pingStream, triggerReload) diff --git a/package.json b/package.json index ea67eee75..2af0aebfc 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "start": "gulp dev", "lint": "gulp lint", "dev": "gulp dev", - "dist": "gulp dist", + "dist": "gulp dist --disableLiveReload", "test": "npm run fastTest && npm run ci && npm run lint", "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\"", |