458 Commits

Author	SHA1	Message	Date
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
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
kumavis	efa92a7fc5	network controller - refactor to use eth-rpc-client	2017-10-10 14:13:12 -07:00
Sergey Ukustov	a1696f89a8	Validate data format for eth_signTypedData	2017-10-07 00:38:13 +03:00
Dan Finlay	c821a6b93a	Bump provider-engine for better sender validations	2017-10-05 14:48:40 -07:00
Dan Finlay	176d03b2e8	Require keyring-controller 2.1.0	2017-10-05 14:39:23 -07:00
Dan Finlay	88686a3968	Enforce 0x prefix on accounts with new hd keyring	2017-10-04 15:35:46 -07:00
kumavis	23bc92a8f1	deps - bump eth-json-rpc-filters for log filter fix	2017-10-04 13:33:50 -07:00
Chi Kei Chan	bd99bc2e88	Merge branch 'master' into NewUI-flat	2017-10-03 16:02:58 -07:00
Thomas Huang	f12504cd09	Merge pull request #2209 from MetaMask/greenkeeper/coveralls-3.0.0 ... Update coveralls to the latest version 🚀	2017-10-03 12:35:25 -07:00
greenkeeper[bot]	98641f6f66	chore(package): update mocha to version 4.0.0	2017-10-03 04:33:04 +00:00
kumavis	e682611301	deps - bump pe for block cache fix	2017-10-02 11:35:26 -07:00
Chi Kei Chan	67ee5b21e6	Query for gas estimates	2017-09-28 17:39:53 -07:00
greenkeeper[bot]	f69cf1670f	chore(package): update coveralls to version 3.0.0	2017-09-28 17:02:58 +00:00
Chi Kei Chan	5a1d50cd43	Merge branch 'master' into mmn	2017-09-27 22:32:07 -07:00
kumavis	cdf41c2857	Merge pull request #2124 from MetaMask/breakout-mascara ... require metamascara	2017-09-27 16:27:01 -07:00
Dan Finlay	112c223930	Merge pull request #2196 from MetaMask/express-bump ... deps - bump express for security fix	2017-09-27 15:26:53 -07:00
kumavis	cd0f44e2d6	deps - bump express for security fix	2017-09-27 14:59:10 -07:00
greenkeeper[bot]	c0d7d44764	fix(package): update eth-keyring-controller to version 2.0.0	2017-09-27 21:54:46 +00:00
Dan Finlay	e72083f6e8	Merge branch 'master' into filter-fixes-moar	2017-09-27 10:57:02 -07:00
kumavis	1877c0766c	Merge branch 'master' of github.com:MetaMask/metamask-extension into BreakOutKeyringController	2017-09-26 21:42:30 -07:00