270808c206
Merge pull request #1082 from MetaMask/notice-management
...
modification of notices.
2017-02-02 16:30:18 -08:00
9b6a06e679
Merge branch 'dev' into notice-management
2017-02-02 16:22:44 -08:00
88882f547e
Change filepath for new location of notices.
2017-02-02 15:59:39 -08:00
afb60b9061
modification of notices.
2017-02-02 15:02:32 -08:00
6df15177c8
Merge pull request #1079 from MetaMask/kumavis-refactor5
...
Refactor round 5
2017-02-02 10:44:06 +09:00
dacbf16fe2
test - first-time - re-add terms header check
2017-02-01 16:41:28 -08:00
4c0cb9d92e
metamask - memState - adopt configManager.isDisclaimerConfirmed from keyring controller
2017-02-01 16:38:09 -08:00
bcff47d9aa
test - mock-dev - expose metamaskController for debugging
2017-02-01 16:31:22 -08:00
d8a12c2ad0
tests - mockDev - fix first-time flow
2017-02-01 16:27:16 -08:00
2d99fc9528
Merge pull request #1078 from MetaMask/messageManagerCleanUp
...
put updateBadge back in
2017-02-01 15:16:21 -08:00
10ce2a781f
emit a update badge
2017-02-01 15:12:15 -08:00
d93708b553
put updateBadge back in
2017-02-01 15:08:06 -08:00
3afa3592fe
Merge pull request #1076 from MetaMask/messageManagerCleanUp
...
Message manager clean up
2017-02-01 15:08:04 -08:00
c7b9adbfcb
swap out set state for updateState
2017-02-01 15:00:41 -08:00
a96f892788
Fix messy merge
2017-02-01 13:25:36 -08:00
54b1339f6a
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 13:05:58 -08:00
25c5a44623
Merge pull request #1077 from MetaMask/i#1075
...
fix transactions not showing up in history
2017-02-02 06:03:18 +09:00
cadea1e09e
Merge pull request #1073 from MetaMask/kumavis-refactor4
...
Kumavis refactor4
2017-02-01 13:00:27 -08:00
6eb6057118
default a return of an empty array
2017-02-01 12:57:00 -08:00
23622632c6
linting
2017-02-01 12:25:52 -08:00
7aca279a5f
fix transactions not showing up in history
2017-02-01 12:19:22 -08:00
ce0c3ed03c
Merge branch 'dev' into messageManagerCleanUp
2017-02-01 12:03:42 -08:00
e2e8a7cca0
Add to CHANGELOG
2017-02-01 11:55:26 -08:00
1b16b46241
code clan up and tests
2017-02-01 11:54:01 -08:00
1cb730144d
metamask - adopt isInitialized from keyring controller
2017-02-01 00:31:26 -08:00
cd5d952600
keyring - move identities into memStore
2017-02-01 00:17:48 -08:00
41c93ceb7e
keyring - add keyringtypes to memStore
2017-02-01 00:02:10 -08:00
d326e7d11e
tests - mock-dev - remove persistence
2017-01-31 23:39:39 -08:00
ad060e2678
metamask - inherit some configManager state from keyring controller
2017-01-31 22:35:11 -08:00
c0d3db6a8c
keyring - synchronous getState
2017-01-31 20:02:38 -08:00
8257853819
Merge pull request #1069 from MetaMask/i1066
...
Introduce Preferences Controller
2017-01-30 15:57:49 -08:00
0b9d37c6c8
migration #6 - fix selectedAddress data source
2017-01-30 15:53:21 -08:00
7ccaa263d2
inpage - set web3.eth.defaultAccount correctly
2017-01-30 15:38:32 -08:00
2fa60cfcbf
continue rename selectedAccount to selectedAddress
2017-01-30 15:25:12 -08:00
f9b31fe2c3
rename selectedAccount to selectedAddress
2017-01-30 15:08:31 -08:00
b1de2cdefa
metamask - rename getSelectedAccount to getSelectedAddress
2017-01-30 13:09:46 -08:00
7a0acb2333
migration #6 - move selectedAccount from keyringController to preferencesController
2017-01-30 13:01:54 -08:00
4dafb09db2
metamask - move selectedAccount set/get to preferencesController
2017-01-30 13:01:07 -08:00
0a1918f71a
preferences - introduce preferences controller
2017-01-30 12:42:24 -08:00
f40629e5ae
Merge branch 'dev' into messageManagerCleanUp
2017-01-30 00:50:02 -08:00
b6909574a7
Merge pull request #1068 from MetaMask/kumavis-refactor3
...
public config - get selectedAccount from keyring controller substate
2017-01-30 00:46:13 -08:00
dd528d886f
metamask - lookup selectedAccount via keyringController
2017-01-30 00:32:04 -08:00
6480c2d8a6
public config - get selectedAccount from keyring controller substate
2017-01-29 23:59:17 -08:00
fdee1e3701
Merge branch 'dev' into messageManagerCleanUp
2017-01-28 22:59:28 -08:00
47b48c0e02
Merge pull request #1062 from MetaMask/kumavis-refactor3
...
Kumavis refactor3
2017-01-28 22:26:47 -08:00
13e2003469
metamask - subscribe metamask store to keyringController substate
2017-01-28 22:12:15 -08:00
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
4dd6ba9c1b
migration 5 - move keyring controller state to substate
2017-01-28 19:19:03 -08:00
e9cdbf4f89
keyring - add and initialize obs-store
2017-01-28 13:12:12 -08:00
1fd1746744
metamask - adopt shapeshift txs from keyringController
2017-01-27 23:05:29 -08:00
kumavis
Kevin Serrano
kumavis
Frankie