820 Commits

Author	SHA1	Message	Date
Frankie	54b1339f6a	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 13:05:58 -08:00
Frankie	ce0c3ed03c	Merge branch 'dev' into messageManagerCleanUp	2017-02-01 12:03:42 -08:00
Frankie	1b16b46241	code clan up and tests	2017-02-01 11:54:01 -08:00
kumavis	1cb730144d	metamask - adopt isInitialized from keyring controller	2017-02-01 00:31:26 -08:00
kumavis	cd5d952600	keyring - move identities into memStore	2017-02-01 00:17:48 -08:00
kumavis	41c93ceb7e	keyring - add keyringtypes to memStore	2017-02-01 00:02:10 -08:00
kumavis	ad060e2678	metamask - inherit some configManager state from keyring controller	2017-01-31 22:35:11 -08:00
kumavis	c0d3db6a8c	keyring - synchronous getState	2017-01-31 20:02:38 -08:00
kumavis	0b9d37c6c8	migration #6 - fix selectedAddress data source	2017-01-30 15:53:21 -08:00
kumavis	7ccaa263d2	inpage - set web3.eth.defaultAccount correctly	2017-01-30 15:38:32 -08:00
kumavis	2fa60cfcbf	continue rename selectedAccount to selectedAddress	2017-01-30 15:25:12 -08:00
kumavis	f9b31fe2c3	rename selectedAccount to selectedAddress	2017-01-30 15:08:31 -08:00
kumavis	b1de2cdefa	metamask - rename getSelectedAccount to getSelectedAddress	2017-01-30 13:09:46 -08:00
kumavis	7a0acb2333	migration #6 - move selectedAccount from keyringController to preferencesController	2017-01-30 13:01:54 -08:00
kumavis	4dafb09db2	metamask - move selectedAccount set/get to preferencesController	2017-01-30 13:01:07 -08:00
kumavis	0a1918f71a	preferences - introduce preferences controller	2017-01-30 12:42:24 -08:00
Frankie	f40629e5ae	Merge branch 'dev' into messageManagerCleanUp	2017-01-30 00:50:02 -08:00
kumavis	dd528d886f	metamask - lookup selectedAccount via keyringController	2017-01-30 00:32:04 -08:00
kumavis	6480c2d8a6	public config - get selectedAccount from keyring controller substate	2017-01-29 23:59:17 -08:00
Frankie	fdee1e3701	Merge branch 'dev' into messageManagerCleanUp	2017-01-28 22:59:28 -08:00
kumavis	13e2003469	metamask - subscribe metamask store to keyringController substate	2017-01-28 22:12:15 -08:00
Frankie	8be68575bb	Clean up message manger includes: ... Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern	2017-01-28 20:28:20 -08:00
kumavis	4dd6ba9c1b	migration 5 - move keyring controller state to substate	2017-01-28 19:19:03 -08:00
kumavis	e9cdbf4f89	keyring - add and initialize obs-store	2017-01-28 13:12:12 -08:00
kumavis	1fd1746744	metamask - adopt shapeshift txs from keyringController	2017-01-27 23:05:29 -08:00
kumavis	3afd0ef27d	tests - remove persistence and start with initial state	2017-01-27 23:04:34 -08:00
kumavis	ad9531d521	metamask - organize methods	2017-01-27 19:35:03 -08:00
Frankie	a8ed780d9b	Merge branch 'dev' into messageManagerCleanUp	2017-01-27 14:17:12 -08:00
Frankie	451845142e	Rewrite message controller to fit controller pattern	2017-01-27 14:16:35 -08:00
kumavis	efcd22905a	metamask - fix setupProviderConnection	2017-01-26 23:03:11 -08:00
kumavis	95b846ba07	keymanager - small clean	2017-01-26 22:31:06 -08:00
kumavis	9ab8362843	metamask controller - cleanup remote api	2017-01-26 22:30:12 -08:00
kumavis	fc1b11e373	metamask - organize into sections	2017-01-26 21:19:09 -08:00
kumavis	832772414e	metamask - use web3-stream-provider/handler instead of manual wiring	2017-01-26 21:18:17 -08:00
kumavis	2113979be7	metamask controller - adopt setup*Communication from background	2017-01-26 20:52:46 -08:00
kumavis	fc3a53ec7b	background - stream disconnection fix	2017-01-26 20:18:28 -08:00
kumavis	2f79781ab9	metamask controller - adopt clearSeedWords from keyring controller	2017-01-26 20:17:36 -08:00
kumavis	dc86ddebb7	background - graceful publicConfigStore connection teardown	2017-01-26 16:07:35 -08:00
kumavis	af115aa4c1	background - organize metamask instantiation	2017-01-26 15:09:31 -08:00
kumavis	76ce348a04	obs-store - use published module	2017-01-24 19:47:00 -08:00
kumavis	a06ee45404	migrations - rename 005 to stubbed _multi-keyring	2017-01-24 16:30:42 -08:00
kumavis	bb1ee8e649	Merge branch 'dev' of github.com:MetaMask/metamask-plugin into obs-store2	2017-01-24 16:09:57 -08:00
kumavis	70b8e640f0	Merge branch 'dev' into i#1048	2017-01-24 15:39:33 -08:00
kumavis	463a56ff54	background controller - extract KeyringC.placeSeedWords to MetamaskC	2017-01-24 15:33:33 -08:00
kumavis	bef4b78196	merge master hotfix into dev	2017-01-24 14:23:54 -08:00
kumavis	e2b2e6d5e1	3.1.2	2017-01-24 14:04:29 -08:00
Frankie	5811f2ab14	Merge pull request #1051 from MetaMask/hotfix1048 ... hotfix - addNewAccount - dont assume hd keyring position	2017-01-24 13:38:24 -08:00
kumavis	745fff0c80	hotfix - dont assume hd keyring position	2017-01-24 13:29:48 -08:00
kumavis	01c88bb0bd	keyring-controller - cleanup	2017-01-24 13:22:26 -08:00
kumavis	8049c1fc07	keyring-controller - cleanup	2017-01-24 13:21:55 -08:00