diff options
| author | Dan Finlay <somniac@me.com> | 2016-07-27 08:38:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-27 08:38:22 +0800 |
| commit | 7a8d0497324f6f05274e7ffeef828134cbf9c481 (patch) | |
| tree | 5590ac44a617cf0ffd8d01c0f001dfb233ceaa9c | |
| parent | 79ce99db07ec30793bb390abfb3278acba7db1c7 (diff) | |
| parent | c759bc587166f4d1953653e3ef3bea359804256c (diff) | |
| download | tangerine-wallet-browser-7a8d0497324f6f05274e7ffeef828134cbf9c481.tar.gz tangerine-wallet-browser-7a8d0497324f6f05274e7ffeef828134cbf9c481.tar.zst tangerine-wallet-browser-7a8d0497324f6f05274e7ffeef828134cbf9c481.zip | |
Merge pull request #492 from MetaMask/FixChromeBuild
Fix chrome build
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | app/manifest.json | 6 | ||||
| -rw-r--r-- | gulpfile.js | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c853ae846..5900b2b7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,15 @@ ## Current Master - Fix bug where web3 would sometimes not be injected in time for the application. +- Fixed bug where sometimes when opening the plugin, it would not fully open until closing and re-opening. +- Got most functionality working within Firefox. + +## 2.7.0 2016-07-21 + - Added a Warning screen about storing ETH - Add buy Button! - MetaMask now throws descriptive errors when apps try to use synchronous web3 methods. - Removed firefox-specific line in manifest. -- Got most functionality working within Firefox. -- Fixed bug where sometimes when opening the plugin, it would not fully open until closing and re-opening. ## 2.6.2 2016-07-20 diff --git a/app/manifest.json b/app/manifest.json index 7039caeb8..9f49d7b52 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,9 +1,9 @@ { - "name": "__MSG_appName__", + "name": "MetaMask", "short_name": "Metamask", - "version": "2.6.2", + "version": "2.7.0", "manifest_version": 2, - "description": "__MSG_appDescription__", + "description": "Ethereum Browser Extension", "icons": { "16": "images/icon-16.png", "128": "images/icon-128.png" diff --git a/gulpfile.js b/gulpfile.js index 976671055..c71ccb652 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -63,7 +63,6 @@ gulp.task('copy:chrome', gulp.series( copyTask({ source: './dist/firefox', destination: './dist/chrome', - pattern: '**/*' }), 'manifest:cleanup')) gulp.task('copy', gulp.series(gulp.parallel('copy:locales','copy:images','copy:fonts','copy:reload','copy:root'), 'copy:chrome')) gulp.task('copy:watch', function(){ @@ -104,7 +103,7 @@ gulp.task('build:js:background', bundleTask({ watch: false, filename: 'backgroun gulp.task('build:js:popup', bundleTask({ watch: false, filename: 'popup.js' })) gulp.task('build:js', gulp.parallel('build:js:inpage','build:js:contentscript','build:js:background','build:js:popup')) -// clean dist/firefox +// clean dist gulp.task('clean', function clean() { |