2339 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	092ec9096b	Fix integration tests.	2017-02-09 22:36:40 -08:00
Kevin Serrano	c7178af09d	Remove trailing comma in JSON.	2017-02-09 22:25:21 -08:00
Kevin Serrano	f9601ac2dd	Merge branch 'dev' into disclaimer-notify	2017-02-09 19:04:17 -08:00
Kevin Serrano	01e43c789c	Merge pull request #1101 from MetaMask/i1085-synchronousnet ... Allowed net_version to be called synchronously	2017-02-09 19:03:22 -08:00
kumavis	d1a6b8c8ed	Merge branch 'dev' into i1085-synchronousnet	2017-02-09 18:41:01 -08:00
Kevin Serrano	65c84ac4b2	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
Kevin Serrano	1d0fcf129c	Fix bugs with notice. Add disclaimer notice.	2017-02-09 17:47:51 -08:00
Kevin Serrano	4033b620bd	Allowed net_version to be called synchronously	2017-02-08 15:51:22 -08:00
kumavis	2f6bf1c074	Merge branch 'master' into dev	2017-02-08 13:17:30 -08:00
kumavis	6d163de3b5	Merge pull request #1098 from MetaMask/Version-3.2.1 ... Version 3.2.1	2017-02-08 13:16:48 -08:00
Dan Finlay	5d827bece3	Version 3.2.1	2017-02-08 13:12:40 -08:00
kumavis	c9aab2084e	Merge pull request #1094 from MetaMask/dev ... Version 3.2.0	2017-02-07 18:55:26 -08:00
Dan Finlay	ce57957aa0	Merge pull request #1093 from MetaMask/Version-3.2.0 ... Version 3.2.0	2017-02-07 16:16:32 -08:00
Dan Finlay	480c7c5d24	Version 3.2.0	2017-02-07 16:11:30 -08:00
Frankie	23639d2b41	Merge pull request #1090 from MetaMask/RemoveEgregiousAlert ... Remove egregious alert	2017-02-06 17:20:55 -08:00
Dan Finlay	b529017149	Remove egregious alert	2017-02-06 16:45:40 -08:00
kumavis	15ae20033c	Merge pull request #1088 from MetaMask/CreateShapeshiftController ... Create shapeshift controller	2017-02-05 16:27:45 -08:00
Dan Finlay	c0637f8d6a	Fix typo	2017-02-04 16:32:09 -08:00
Dan Finlay	0c0c0051e4	Remove shapeshift tx list from idStore	2017-02-04 15:20:31 -08:00
Dan Finlay	89bbccb09c	Stop removing old shapeshift txs	2017-02-04 15:15:50 -08:00
Dan Finlay	af439cc6cf	Do not remove completed shapeshift deposits	2017-02-03 21:40:27 -08:00
Dan Finlay	901eeb5c10	Fix bug when clearing old shapeshift txs	2017-02-03 21:39:22 -08:00
Dan Finlay	5d37f90787	Automatically remove shapeshift txs over 11 minutes old with no payment	2017-02-03 21:36:04 -08:00
Dan Finlay	c9024655d3	Add migration to index	2017-02-03 21:35:54 -08:00
Dan Finlay	4dc71ed57b	Got ShapeShiftController back to working	2017-02-03 21:12:18 -08:00
Dan Finlay	13ee92909c	Mostly got shapeshift tx management into its own controller ... Rendering the list is still having issues, so this isn't done yet.	2017-02-03 20:45:20 -08:00
Kevin Serrano	24ff38e973	Merge pull request #1087 from MetaMask/kumavis-refactor7 ... bugfix - eth-store - update store state after manipulating	2017-02-03 16:17:04 -08:00
kumavis	bc4efa1807	eth-store - update store state after manipulating	2017-02-03 16:07:58 -08:00
kumavis	eb08a4f41f	Merge pull request #1086 from MetaMask/kumavis-refactor7 ... Refactor round 7	2017-02-03 15:36:45 -08:00
kumavis	e1719191f4	test - skip eth_sign tests until we have test data	2017-02-03 15:16:21 -08:00
kumavis	ff87b9dc7a	id mgmt - update to latest eth_sign spec	2017-02-03 14:59:07 -08:00
kumavis	77f8995568	migrations - fix migration #9 and add safety checks to migrator	2017-02-03 14:00:30 -08:00
kumavis	99d6a329a2	eths-store - eagerly set current block	2017-02-03 12:35:01 -08:00
kumavis	66be5ff275	Merge pull request #1083 from MetaMask/kumavis-refactor6 ... Refactor round 6	2017-02-03 00:17:17 -08:00
kumavis	970d4fd695	metamask - add missing diskState and memState subscriptions	2017-02-02 23:47:00 -08:00
kumavis	9e4ef45b6a	migration #9 - break out CurrencyController substate	2017-02-02 23:32:24 -08:00
kumavis	b233e7e37c	eth-store - cbs default to noop	2017-02-02 22:32:00 -08:00
kumavis	8b5e3aa287	migration #8 - break out NoticeController substate	2017-02-02 22:23:45 -08:00
kumavis	73edfc9f31	eth-store - convert to obs-store subclass	2017-02-02 22:05:06 -08:00
kumavis	f08f40aee2	txManager - depend on preferencesStore	2017-02-02 21:09:17 -08:00
kumavis	0c6df24ecf	metamask - introduce networkStore	2017-02-02 20:59:47 -08:00
kumavis	99fa9ab13a	migration 7 - break off TransactionManager substate	2017-02-02 20:20:13 -08:00
kumavis	bcb86f38cb	messageManager - move view state to obs-store	2017-02-02 18:21:22 -08:00
kumavis	79ed2e902f	keyring - replace getState with memStore	2017-02-02 17:07:52 -08:00
kumavis	134a4c7bc3	keyring - manage isUnlocked in memStore	2017-02-02 16:59:15 -08:00
kumavis	5c5aa6ea01	keyring - rm config dep	2017-02-02 16:54:16 -08:00
kumavis	296b278592	actions - dont expect background to provide newState, manually update	2017-02-02 16:46:56 -08:00
kumavis	270808c206	Merge pull request #1082 from MetaMask/notice-management ... modification of notices.	2017-02-02 16:30:18 -08:00
Kevin Serrano	9b6a06e679	Merge branch 'dev' into notice-management	2017-02-02 16:22:44 -08:00
Kevin Serrano	88882f547e	Change filepath for new location of notices.	2017-02-02 15:59:39 -08:00