1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 12:47:14 +01:00
Commit Graph

769 Commits

Author SHA1 Message Date
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Dan J Miller
5b2864d070
Merge pull request #5138 from MetaMask/greenkeeper/monorepo.enzyme-1.6.0
Update enzyme to the latest version 🚀
2018-09-04 11:25:40 -02:30
Dan Finlay
45cbe6b5b3 Bump human-standard-token-abi version for DAI support 2018-08-30 12:31:24 -07:00
greenkeeper[bot]
012fb0e3e6 chore(package): update enzyme-adapter-react-15 to version 1.0.6 2018-08-25 00:55:45 +00:00
greenkeeper[bot]
41a13bb341 chore(package): update enzyme to version 3.4.4 2018-08-25 00:51:40 +00:00
Alexander Tseung
d1de5ae94f Add react-media package to prevent rendering wallet-view twice in the popup view 2018-08-23 16:44:43 -07:00
Antoine Nauleau
3854650546 Minimum Browsers Supported (#4873)
* Minimum supported browsers and version standard: add browsers and targets to .babelrc and package.json

* Regenerate package.json, fix issue with comma in merge

* Resolve merge conflicts

* Regenerate package-lock.json

* Revert to previous package-lock.json
2018-08-22 20:20:24 -02:30
brunobar79
055e0f8dac fix merge conflicts 2018-08-22 13:37:47 -04:00
Dan Finlay
babd59a2dc
Merge pull request #5109 from MetaMask/MoveOutInpageProvider
Move inpage-provider and port-stream outside
2018-08-21 14:38:47 -07:00
kumavis
13dfea7f2d bugfix - prevents old blocktracker from getting internal hooks migrated 2018-08-21 14:13:23 -07:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Dan Finlay
6ce119d1fb Move inpage-provider and port-stream outside
With the creation of the [metamask-extension-provider](https://github.com/MetaMask/metamask-extension-provider) we have our first non-core module that is dependent on the inpage-provider and port-stream.

To reduce the size of its dependencies, I have moved the
[metamask-inpage-provider](https://github.com/MetaMask/metamask-inpage-provider) into its own module, as well as [extension-port-stream](https://github.com/MetaMask/extension-port-stream).

This allows them to be more easily depended & iterated on by external
projects.
2018-08-20 15:45:50 -07:00
brunobar79
992e7f1b5a fix merge conflicts 2018-08-17 12:56:07 -04:00
brunobar79
e54b8507d2 use eth-ledger-bridge-keyring from npm 2018-08-14 23:02:01 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
brunobar79
77ad856730 remove ledger lib 2018-08-12 01:46:09 -04:00
brunobar79
0b9b892c6b this should be ready to go 2018-08-12 01:34:01 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
brunobar79
656afeefad fix merge conflicts 2018-08-08 15:40:04 -04:00
brunobar79
286bde606f fix merge conflicts 2018-08-08 14:30:49 -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