Commit Graph

477 Commits

Author SHA1 Message Date
Alexander Tseung e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
Dan ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Thomas Huang 2b1f2557c7
Merge pull request #2615 from jpclark/NewUI-flat
Provide blockie identicon option
2017-11-28 13:58:06 -06:00
Thomas Huang 9b25f89728 Update babelify to 8.0.0 2017-11-27 12:35:19 -06:00
Jason Clark a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Thomas Huang 109050817a Update react, react-dom, and react-test-renderer to 15.6.2 2017-11-27 08:46:47 -06:00
Thomas Huang 1ee91a51cc Update ethjs-query to v0.3.1 2017-11-26 10:46:28 -06:00
Thomas Huang 178b657c75 Update Qunit to QunitJS v2.4.1 2017-11-26 10:03:17 -06:00
Thomas Huang cefe6cded6 Update to Enzyme 3.2.0 2017-11-25 18:37:12 -06:00
Jason Clark 1b89ceb63a swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code 2017-11-25 14:33:42 -07:00
Jason Clark dc7bd3c628 incremental commit of working blockie component 2017-11-24 13:48:56 -07:00
Jason Clark fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor) 90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Dan acc973d543 Update classnames for integration tests and add output/index.css to integration test for ci 2017-11-02 15:16:43 -07:00
Dan b7653e8207 Get current NewUI-flat tests working. 2017-11-02 15:16:43 -07:00
Dan 56e9f98bd0 More lint fixes 2017-11-02 09:45:59 -02:30
Chi Kei Chan 301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Kevin Serrano 1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Chi Kei Chan 7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
tmashuang 91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Kevin Serrano 721019bc2b
Temporarily reversal of json-rpc-engine 2017-10-21 14:47:12 -07:00
Daijiro Wachi c1eb8f16dc Add lint:fix command to gulp and npm-scripts 2017-10-21 21:04:24 +02:00
Chi Kei Chan 5484e68896 Add Integration Tests 2017-10-20 21:51:37 -07:00
Chi Kei Chan ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan 5aaa2d679b Add ShapeShift UI 2017-10-20 21:51:37 -07:00
Chi Kei Chan c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Chi Kei Chan e88baff2ee Add missing presets 2017-10-20 21:51:37 -07:00
Jacky Chan 638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan 1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
kumavis 61e1b821d4 Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-fix-maybe 2017-10-20 12:31:40 -07:00
kumavis 8472ca406a deps - bump eth-json-rpc-filters for log filter fix 2017-10-20 12:29:12 -07:00
Chi Kei Chan 344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Thomas Huang c24e266118 Merge branch 'master' into i2348-SelectAccountOnNewVault 2017-10-20 09:04:57 -04:00
Chi Kei Chan 69d8359639 Update eth-keyring-controller dependency 2017-10-19 17:48:45 -07:00
Dan Finlay 942de9ba02 Patch sandwich-expando for security update 2017-10-19 09:47:48 -07:00
Chi Kei Chan c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
kumavis 209db9ae5f deps - bump eth-json-rpc-filters 2017-10-18 19:53:48 -07:00
Dan Finlay 21bde66e16 Remove account-tracker from keyringController 2017-10-18 17:14:26 -07:00
Kevin Serrano 5bdee96e73 Merge pull request #2368 from MetaMask/greenkeeper/react-simple-file-input-2.0.0
Update react-simple-file-input to the latest version 🚀
2017-10-18 17:10:30 -07:00
kumavis 8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Kevin Serrano d9f5e6beb2 Merge pull request #2370 from MetaMask/MoveOutEtherscanLinkGeneration
Move etherscan link logic into module
2017-10-16 11:31:05 -07:00
Dan Finlay c77bc5d408 Bump version on eth-simple-keyring
Fixes bug where imported accounts could not use the new `signTypedData` method.
2017-10-16 04:12:51 -07:00
Dan Finlay 06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
greenkeeper[bot] 970fbd797a fix(package): update react-simple-file-input to version 2.0.0 2017-10-14 12:05:00 +00:00
Dan 7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
kumavis 5c5f9297f7 deps - bump eth-rpc-client for fix 2017-10-11 18:36:25 -07:00
kumavis 4096ec9f69 deps - bump eth-json-rpc-middleware for fix 2017-10-10 20:20:12 -07:00
kumavis 0f8d7dacb1 network-controller - use obj-proxy for providerProxy 2017-10-10 17:26:44 -07:00