brunobar79
656afeefad
fix merge conflicts
2018-08-08 15:40:04 -04:00
Paul Bouchon
8ac4b586eb
Update eth-keyring-controller and eth-hd-keyring versions ( #4989 )
2018-08-08 13:17:48 -04:00
bitpshr
365e349ec4
Reestablish old versions of eth-keyring-controller and eth-hd-keyring
2018-08-08 08:17:16 -04:00
brunobar79
2e0916d8ff
fix merge conflicts
2018-08-08 02:32:35 -04:00
Whymarrh Whitby
46046c6915
Update chromedriver pkg
2018-08-06 15:47:57 -02:30
Whymarrh Whitby
29488b2c53
Add static-server devDependency
2018-08-06 15:47:57 -02:30
Whymarrh Whitby
6132238302
Remove superstatic package
...
Install and uninstalling superstatic doesn't work on Node 8 at the time of
writing:
$ npm install -D superstatic@6
npm ERR! code ENOTSUP
npm ERR! notsup Unsupported engine for got@5.7.1: wanted: {"node":">=0.10.0 <7"} (current: {"node":"8.11.3","npm":"6.3.0"})
npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
npm ERR! notsup Not compatible with your version of node/npm: got@5.7.1
npm ERR! notsup Required: {"node":">=0.10.0 <7"}
npm ERR! notsup Actual: {"npm":"6.3.0","node":"8.11.3"}
This commit removes the package (using Node 6!) and it will have to be replaced.
2018-08-06 15:47:57 -02:30
brunobar79
710b4e294f
added crossbrowser support and error handling
2018-07-31 18:30:56 -04:00
brunobar79
4de8f5b0d4
fix dependencies
2018-07-26 21:37:43 -04:00
brunobar79
69f4c8c336
fix merge conflicts
2018-07-26 21:04:03 -04:00
brunobar79
d4a15f22c2
added webrtc-adapter for browser compat
2018-07-26 21:00:48 -04:00
brunobar79
ea028e7506
fully working without tweaking ext. permission
2018-07-26 20:56:58 -04:00
brunobar79
6cd4bc9f4e
working without permission issues
2018-07-26 20:24:39 -04:00
Antoine Nauleau
653e42cf79
Update Babel to Current Standard "babel-preset-env" ( #4812 )
...
* Update .babelrc and package.json to babel-preset-env standard
* Install babel-preset-env babel-stage-0
* Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix
* Resolve PR #4812 merge conflicts
* Merge #4847 Solves previous cache issues with cirlce-ci
2018-07-24 15:21:32 -02:30
brunobar79
2e50348241
added instascan pkg
2018-07-23 17:11:51 -04:00
brunobar79
cde91fac16
added node version requirements
2018-07-21 12:43:35 -04:00
brunobar79
de21a49265
use latest keyring packages
2018-07-16 15:31:05 -04:00
brunobar79
5710e648bd
remove account modal updated
2018-07-12 18:19:33 -04:00
brunobar79
4b528405ea
catching up with develop
2018-07-12 13:19:51 -04:00
brunobar79
07d8bfaec5
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
2018-07-12 12:54:08 -04:00
brunobar79
89cc48789a
update to temp dependencies
2018-07-11 20:01:44 -04:00
Alexander Tseung
7d691c7398
Fix existing unit tests
2018-07-07 18:53:00 -07:00
brunobar79
64e397a6f1
update package-lock.json
2018-07-06 20:04:31 -04:00
Alexander Tseung
9cde5ab11b
Use eth-method-registry to get method data
2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427
Refactor and redesign confirm transaction views
2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
2018-07-06 19:21:18 -04:00
brunobar79
986bb74501
package.json updated and tests passing
2018-07-03 20:24:21 -04:00
brunobar79
d382f89989
tests are passing
2018-07-03 20:21:01 -04:00
brunobar79
595447ccac
Merge remote-tracking branch 'upstream/develop' into HEAD
2018-07-03 14:21:17 -04:00
brunobar79
3290421e2f
fix merge conflicts
2018-07-03 13:31:30 -04:00
kumavis
1f0cf11af1
Merge pull request #4712 from MetaMask/lint-fix
...
Lint - Lint all the things (without conflicts!)
2018-07-03 09:40:25 -07:00
brunobar79
cc11a62397
remove gulp eslint and cleanup gulpfile
2018-07-02 18:35:53 -04:00
Esteban MIno
4b45dd4ed0
point eth-contract-metadata to repo master
2018-07-02 18:29:22 -04:00
brunobar79
85fd75c21f
update package-lock.json
2018-07-02 17:03:20 -04:00
brunobar79
9b0bc67066
fix merge conflicts
2018-07-02 15:29:26 -04:00
Bruno Barbieri
4c86f25f5b
npm 6 fresh lock + node 8 ( #4675 )
...
* run npm install with npm 6 and node 8
* npm audit fix --force
* bump node version on circleci docker img
* bump lodash
2018-07-02 10:30:56 -07:00
brunobar79
66b3b72c98
use latest eth-keyring-controller
2018-07-01 12:00:04 -10:00
brunobar79
1494cc5e6c
fix merge conflicts
2018-07-01 11:41:34 -10:00
Dan
f824a2982a
Use supersonic instead of httpserver to serve local dapp (e2e beta tests)
2018-06-28 10:16:36 -02:30
Dan
c343a12543
Use locally served dapp to test contract calls in e2e beta tests
2018-06-27 11:08:15 -02:30
brunobar79
6e563acd93
use latest eth-trezor-keyring
2018-06-25 12:24:58 -10:00
brunobar79
87dfca0767
fixes
2018-06-23 02:52:11 -04:00
brunobar79
4381d3e71d
point to new version of eth-trezor-keyring
2018-06-22 23:25:19 -04:00
kumavis
ac8b56a00d
notices - notices collection is now manually edited
2018-06-13 22:56:46 -07:00
Bruno
bb4cc72646
fix merge conflicts
2018-06-13 02:01:47 -04:00
Bruno
fe3d81cfd8
upgrade eth-trezor-keyring
2018-06-13 01:44:53 -04:00
Bruno
8763ea898e
move TrezorKeyring to its own package
2018-06-13 01:32:13 -04:00
Dan Finlay
9c77af1ce6
Add script for auto-re-running tests on change
...
`npm run watch:test:unit` will re-run the unit test suite whenever a
file in `app`, `ui`, or `test` changes.
2018-06-12 11:13:44 -07:00
Bruno
8c4d58aa45
initial trezor support
2018-06-10 03:52:32 -04:00
PhyrexTsai
f90d070190
Merge branch 'develop' into portal-metamask
2018-06-01 15:41:18 +08:00
