diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-09-14 03:18:19 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-09-14 03:18:19 +0800 |
| commit | 19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a (patch) | |
| tree | 425f11071576a44ca4327125056ac217ae499bae /package.json | |
| parent | 4aa5114019870ea6606d98ee9bf5092b45ed9fc5 (diff) | |
| parent | 54ecb09a209bf3ffeba968a79acfa500625b0d4a (diff) | |
| download | tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.gz tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.bz2 tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.lz tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.xz tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.tar.zst tangerine-wallet-browser-19c1b1fd8e28c10f85ed5f612d10c8b87e2e5c8a.zip | |
Merge branch 'master' into qrCode
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package.json b/package.json index dddecc5cf..423bd6a02 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "lint": "gulp lint", "dev": "gulp dev", "dist": "gulp dist", - "test": "npm run fastTest && npm run ci", + "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\"", "ui": "node development/genStates.js && beefy ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", @@ -45,9 +45,12 @@ "eth-store": "^1.1.0", "ethereumjs-tx": "^1.0.0", "ethereumjs-util": "^4.4.0", + "express": "^4.14.0", "gulp-eslint": "^2.0.0", "hat": "0.0.3", "identicon.js": "^1.2.1", + "iframe": "^1.0.0", + "iframe-stream": "^1.0.2", "inject-css": "^0.1.1", "jazzicon": "^1.1.3", "menu-droppo": "^1.1.0", @@ -77,7 +80,7 @@ "three.js": "^0.73.2", "through2": "^2.0.1", "vreme": "^3.0.2", - "web3": "^0.17.0-alpha", + "web3": "ethereum/web3.js#260ac6e78a8ce4b2e13f5bb0fdb65f4088585876", "web3-provider-engine": "^8.0.2", "web3-stream-provider": "^2.0.6", "xtend": "^4.0.1" |