diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-10-19 05:20:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-19 05:20:16 +0800 |
| commit | 82489129d5c8eda70f21e7037d428969e695b87b (patch) | |
| tree | 2d21b266d930280311a215a62f6e40fa61cce773 | |
| parent | 049705004f306bb83ad1bc0b7315d322becf8263 (diff) | |
| parent | a88a48ba14a213920ce1becb0b70cf10192ad3e5 (diff) | |
| download | tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.gz tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.bz2 tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.lz tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.xz tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.tar.zst tangerine-wallet-browser-82489129d5c8eda70f21e7037d428969e695b87b.zip | |
Merge branch 'master' into i743-FixDelegateCallFlag
| -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 4f6e82e94..d6d400b66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,16 @@ ## Current Master +## 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\"", |