1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 02:58:09 +01:00
Commit Graph

2404 Commits

Author SHA1 Message Date
Frankie
f40629e5ae Merge branch 'dev' into messageManagerCleanUp 2017-01-30 00:50:02 -08:00
Frankie
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
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
47b48c0e02 Merge pull request #1062 from MetaMask/kumavis-refactor3
Kumavis refactor3
2017-01-28 22:26:47 -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
Frankie
61528bdf08 Merge pull request #1058 from MetaMask/kumavis-refactor2
Ongoing refactor and cleanup
2017-01-27 12:17:42 -08:00
kumavis
efcd22905a metamask - fix setupProviderConnection 2017-01-26 23:03:11 -08:00
kumavis
d7fde88f4b Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2 2017-01-26 22:31:55 -08:00
kumavis
95b846ba07 keymanager - small clean 2017-01-26 22:31:06 -08:00
kumavis
acdd168fbc lint -ignore extra spaces before values in obj expression 2017-01-26 22:30:46 -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
9616bd826d test - lint first 2017-01-26 20:53:48 -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
41bc9c221e Merge pull request #1056 from MetaMask/i#1006
Fix ui overlap
2017-01-26 19:53:54 -08:00
kumavis
2b34cb4564 Merge pull request #1057 from MetaMask/kumavis-refactor1
background - various refactor, cleanups, and fixes
2017-01-26 16:14:52 -08:00
kumavis
dc86ddebb7 background - graceful publicConfigStore connection teardown 2017-01-26 16:07:35 -08:00
kumavis
a14a25c423 config-manager - default to USD for currentFiat 2017-01-26 15:22:13 -08:00
kumavis
af115aa4c1 background - organize metamask instantiation 2017-01-26 15:09:31 -08:00
Frankie
583dc100ab Fix ui overlap 2017-01-26 14:53:42 -08:00
kumavis
d30612a216 Merge pull request #999 from MetaMask/obs-store2
background - introduce ObservableStore (mark II)
2017-01-24 20:38:13 -08:00
kumavis
0f33acb80c mock-dev - cleanup missing polyfill 2017-01-24 20:28:10 -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
Frankie
4f39e8192c Merge pull request #1054 from MetaMask/i#1048
Background - Extracts primary account code from keyring controller
2017-01-24 15:44:02 -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
23c2b0b9a5 Merge pull request #1050 from MetaMask/fixConfTxBalanceLogic
Fix conf tx balance logic
2017-01-24 15:00:46 -08:00
Frankie
8ed657d5d5 fix base 2017-01-24 14:54:38 -08:00
kumavis
bef4b78196 merge master hotfix into dev 2017-01-24 14:23:54 -08:00
kumavis
ffe588365c Merge pull request #1053 from MetaMask/3.1.2
Release 3.1.2
2017-01-24 14:09:42 -08:00
kumavis
e2b2e6d5e1 3.1.2 2017-01-24 14:04:29 -08:00
kumavis
44d0fcf0af Merge pull request #1052 from MetaMask/hotfix1048
hotfix - dont assume hd keyring position
2017-01-24 14:02:26 -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