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 |
|
kumavis
|
8049c1fc07
|
keyring-controller - cleanup
|
2017-01-24 13:21:55 -08:00 |
|
Frankie
|
42bb90341d
|
add to CHANGELOG
|
2017-01-24 13:21:15 -08:00 |
|
Frankie
|
b2623510ae
|
Fix issue where ConfTx view lets you approve txs when the account has insufficient balance
|
2017-01-24 13:19:26 -08:00 |
|
Frankie
|
de88a49243
|
add to CHANGELOG
|
2017-01-24 12:29:20 -08:00 |
|
Frankie
|
48ffea0142
|
Move the assumption of their only being one hd keyring when requesting seed words to metamaskController
|
2017-01-24 12:28:05 -08:00 |
|
Frankie
|
8642ced310
|
Fix issue where generating a new account would put it in loose keys
|
2017-01-24 12:06:59 -08:00 |
|
kumavis
|
74dc20bdf1
|
Merge branch 'dev' into obs-store2
|
2017-01-21 10:06:50 -08:00 |
|
kumavis
|
247f7aad5e
|
Merge pull request #1042 from MetaMask/upToDate
keep dev Up to date
|
2017-01-20 14:46:40 -08:00 |
|
Frankie
|
c587d0f7db
|
Merge branch 'master' into upToDate
|
2017-01-20 14:40:22 -08:00 |
|
kumavis
|
85b34e3f2b
|
Merge pull request #1040 from MetaMask/3.1.1
3.1.1
|
2017-01-20 14:33:44 -08:00 |
|
kumavis
|
389a104f0d
|
3.1.1
|
2017-01-20 14:29:07 -08:00 |
|
kumavis
|
03c58343a3
|
Merge pull request #1039 from MetaMask/upToDate
Keep dev up to date with master
|
2017-01-20 14:09:06 -08:00 |
|
Frankie
|
56d400b0f8
|
Merge branch 'master' into upToDate
|
2017-01-20 14:01:58 -08:00 |