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

4214 Commits

Author SHA1 Message Date
kumavis
7bdf73b1dd Merge pull request #2233 from MetaMask/remove-accountTracker-from-transactions
pending-tx - dont check the balance to rebrodcast
2017-09-29 17:36:49 -07:00
Frankie
8425fb04d3 Merge pull request #2239 from MetaMask/network-controller-contd
network - make network controller internal network switching explicit
2017-09-29 17:22:16 -07:00
kumavis
1ad8a9a0ff network - make network controller internal network switching explicit 2017-09-29 17:10:34 -07:00
Frankie
f57fd717fe Merge pull request #2237 from MetaMask/network-controller-contd
Networking refactor
2017-09-29 16:50:31 -07:00
kumavis
a2b6d3ffc5 network - remove long dead etherscan provider code 2017-09-29 16:37:01 -07:00
kumavis
d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
kumavis
b88d11f86e network controller - small refactor 2017-09-29 16:09:38 -07:00
kumavis
b2796c168b Merge pull request #2234 from MetaMask/Version-3.10.7
Version 3.10.7
2017-09-29 13:23:12 -07:00
Dan Finlay
14d58e630d Version 3.10.7 2017-09-29 13:17:21 -07:00
frankiebee
ac80eaca1f pending-tx - dont check the balance to rebrodcast 2017-09-29 12:54:05 -07:00
Dan Finlay
77963e8417 Merge pull request #2230 from MetaMask/ui-dev-fix
development - fix ui dev
2017-09-29 12:11:48 -07:00
kumavis
19e7adad19 development - fix ui dev 2017-09-29 11:50:24 -07:00
Kevin Serrano
d61f36808a Merge pull request #2228 from MetaMask/i2218-SelectAccountBugFix
Ensure selected account is always set if possible
2017-09-29 11:31:18 -07:00
Dan Finlay
861bd877f3 Ensure selected account is always set if possible
Fixes #2218

Subscribes to keyringController, and if only one account exists, sets it as selected.
2017-09-29 11:19:54 -07:00
greenkeeper[bot]
f69cf1670f chore(package): update coveralls to version 3.0.0 2017-09-28 17:02:58 +00:00
kumavis
cdf41c2857 Merge pull request #2124 from MetaMask/breakout-mascara
require metamascara
2017-09-27 16:27:01 -07:00
kumavis
e451655c10 Merge pull request #2177 from MetaMask/new-currency-test
Switching To Infura's Currency API
2017-09-27 16:26:44 -07:00
frankiebee
b24e16d346 re-enabled x-metamask-origin for mascara 2017-09-27 16:14:58 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
kumavis
ecf909e140 Merge pull request #2194 from MetaMask/network-controller-refactor
Network controller refactor
2017-09-27 15:56:23 -07:00
Thomas Huang
fc17d4511d Merge pull request #2193 from MetaMask/FixAccountSelection
Fix account selection
2017-09-27 15:40:45 -07:00
Dan Finlay
112c223930 Merge pull request #2196 from MetaMask/express-bump
deps - bump express for security fix
2017-09-27 15:26:53 -07:00
Dan Finlay
b473d440a3 Version 3.10.6 2017-09-27 15:14:40 -07:00
Thomas Huang
504dcc3021 Merge pull request #2195 from MetaMask/greenkeeper/eth-keyring-controller-2.0.0
Update eth-keyring-controller to the latest version 🚀
2017-09-27 15:07:46 -07:00
kumavis
cd0f44e2d6 deps - bump express for security fix 2017-09-27 14:59:10 -07:00
Dan Finlay
a246770866 Commit to the eth-keyring-controller module 2017-09-27 14:55:34 -07:00
greenkeeper[bot]
c0d7d44764 fix(package): update eth-keyring-controller to version 2.0.0 2017-09-27 21:54:46 +00:00
Dan Finlay
aefd17ef94 Remove dead reference 2017-09-27 14:45:24 -07:00
kumavis
06b5dd2096 network controller - move _setProvider to bottom 2017-09-27 14:44:54 -07:00
Dan Finlay
ea12be2c1b Bump changelog 2017-09-27 14:44:44 -07:00
kumavis
f2d9b75e94 network controller - refactor to use _setProvider 2017-09-27 14:44:13 -07:00
Dan Finlay
96ebbde634 Fix Account Selection
Do not select accounts on restore, only on creation and deliberate selection.

Fixes #2164
2017-09-27 14:43:34 -07:00
Dan Finlay
87458dae24 Merge pull request #2191 from MetaMask/direct-block-tracker
Fix for direct use of eth-block-tracker
2017-09-27 14:22:41 -07:00
kumavis
7d499df8e3 account-tracker - remove unused import 2017-09-27 14:12:45 -07:00
kumavis
c781e11c7a network - remove getter/setter 2017-09-27 14:10:58 -07:00
kumavis
7e9c6e96a1 metamask - improve comment 2017-09-27 14:10:17 -07:00
kumavis
4404dfc5d3 Merge branch 'master' into direct-block-tracker 2017-09-27 13:58:54 -07:00
kumavis
5bbea78306 Merge pull request #2035 from MetaMask/transactionControllerRefractorPt3
Transaction controller refractor pt3
2017-09-27 13:57:04 -07:00
kumavis
496fd2a5ba Merge pull request #2190 from MetaMask/Version-3.10.5
Version 3.10.5
2017-09-27 13:55:39 -07:00
kumavis
b41aad6d1a style - small whitespace nitpick 2017-09-27 12:33:46 -07:00
kumavis
89e690fc79 account-tracker - use new block-tracker block format 2017-09-27 12:33:00 -07:00
Dan Finlay
1983e161c6 Fix accountTracker store references 2017-09-27 12:29:09 -07:00
Dan Finlay
a453eb132d Version 3.10.5 2017-09-27 12:10:25 -07:00
Dan Finlay
8d3fec42d0 Fix bug where block gas limit was incorrectly parsed. 2017-09-27 12:09:32 -07:00
Dan Finlay
52976d6edc Merge pull request #2189 from MetaMask/Version-3.10.4
Version 3.10.4
2017-09-27 11:54:14 -07:00
tmashuang
734490c58c Add AUD, HKD, SGD, IDR, PHP to currency conversion list 2017-09-27 11:16:38 -07:00
Dan Finlay
d77e0aff4d Version 3.10.4 2017-09-27 11:15:22 -07:00
Dan Finlay
828dbd7e3f Merge pull request #2155 from MetaMask/filter-fixes-moar
Various fixes you've been waiting for, how exciting!
2017-09-27 11:13:06 -07:00
Dan Finlay
e72083f6e8 Merge branch 'master' into filter-fixes-moar 2017-09-27 10:57:02 -07:00
kumavis
ca0dff06f5 Merge pull request #2153 from MetaMask/BreakOutKeyringController
Break out keyring controller into separate module
2017-09-27 10:44:52 -07:00