1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-14 13:47:13 +01:00
Commit Graph

14196 Commits

Author SHA1 Message Date
Dan Finlay
d9f8a8f9b2 Version 2.13.10 2016-11-22 14:51:33 -08:00
Dan Finlay
c8176c9439 Merge pull request #875 from MetaMask/i868-estimateGasTooHigh-dev
I868 estimate gas too high dev
2016-11-22 14:42:46 -08:00
kumavis
bc39cd7b89 KeyringController - estimateGas->analyzeGasUsage fix gasLimit + detect OOG 2016-11-22 14:28:31 -08:00
kumavis
e14efa8f17 Merge pull request #858 from MetaMask/i842-WaitForSeedWord
I842 wait for seed word
2016-11-22 16:18:43 -05:00
Dan Finlay
c4056a861a Move state update outside of conditional callback block 2016-11-22 13:13:10 -08:00
kumavis
785fef3449 Merge pull request #872 from MetaMask/i868-estimateGasTooHigh
Improve gas estimation logic
2016-11-22 16:09:18 -05:00
Dan Finlay
869d731319 Restore ropsten link support 2016-11-22 13:00:13 -08:00
Dan Finlay
606c0b7618 Remove callback type check 2016-11-22 12:57:15 -08:00
kumavis
4669f262e2 Merge pull request #857 from MetaMask/i841-RenameMethod
Rename idStoreMigrator method for clarity
2016-11-22 15:55:48 -05:00
Dan Finlay
a67b4d7131 Fix etherscan link generation test 2016-11-22 12:54:27 -08:00
kumavis
e61d792832 Merge pull request #869 from MetaMask/dev-cleanup
Dev Cleanup Package
2016-11-22 15:23:55 -05:00
kumavis
49a1f43736 Merge branch 'master' into i868-estimateGasTooHigh 2016-11-22 15:14:25 -05:00
kumavis
fa2f0dee28 idStore - fix estimateGas calculation 2016-11-22 12:10:49 -08:00
kumavis
1a8d95f562 Merge pull request #871 from MetaMask/i860-ethjsremove
Phase out ethereumjs-util from encryptor module.
2016-11-22 15:06:03 -05:00
Kevin Serrano
6dad4f1f20
Phase out ethereumjs-util from encryptor module. 2016-11-22 11:17:05 -08:00
Dan Finlay
0289444fcb Merge branch 'dev' into i842-WaitForSeedWord 2016-11-22 10:51:48 -08:00
Kevin Serrano
8261cf232d
Merge branch 'dev' into dev-cleanup 2016-11-22 10:50:15 -08:00
kumavis
b9d73a4b8f Merge pull request #864 from MetaMask/new-faucet
Point to ropsten faucet
2016-11-22 13:46:13 -05:00
Dan Finlay
cffe0c27f3 Merge branch 'master' into new-faucet 2016-11-22 10:31:29 -08:00
Dan Finlay
ca819781cb Merge pull request #866 from MetaMask/new-faucet-dev
Make ropsten faucet button point at the correct url.
2016-11-22 10:30:50 -08:00
Kevin Serrano
d92741c419 Merge pull request #856 from MetaMask/i835-OrganizeKeyrings
I835 organize keyrings
2016-11-22 10:26:16 -08:00
Kevin Serrano
2df6ebbd10 Merge pull request #855 from MetaMask/i834-RopstenLinks
Add ropsten link support
2016-11-22 10:23:01 -08:00
Kevin Serrano
17669e4af8
Make ropsten faucet button point at the correct url. 2016-11-22 10:20:59 -08:00
Kevin Serrano
8d2afccdc0
Ropsten has sole access to the faucet. 2016-11-22 10:13:57 -08:00
Dan Finlay
136296aad6 Began moving salt into encryptor 2016-11-22 09:52:43 -08:00
Kevin Serrano
88ed1f191f
Add to changelog. 2016-11-22 09:45:28 -08:00
Dan Finlay
ea56426b23 Use callback in placeSeedWord method.
When displaying seed words, we were not using a callback, which had some race condition potential.  This is simply a little cleaner and more correct.

Fixes #842
2016-11-21 20:08:36 -08:00
Dan Finlay
9fb96128e6 Rename idStoreMigrator method for clarity
Fixes #841
2016-11-21 19:52:56 -08:00
Dan Finlay
60afc41bb6 Fix keyring test 2016-11-21 19:47:45 -08:00
Dan Finlay
e2a9e1cd4a Unify test wording 2016-11-21 19:45:05 -08:00
Dan Finlay
694f34ae9a Add temporary morden explorer link support 2016-11-21 19:43:59 -08:00
Dan Finlay
ced36eb201 Improve Keyring organization
Separated public & private methods. (Fixes #845)
Made class method `type()` into a simple property. (Fixes #846)
2016-11-21 19:40:58 -08:00
Dan Finlay
ecfda5bcc5 Revert premature link test fix 2016-11-21 19:39:19 -08:00
Dan Finlay
daec4d5c36 Fix ropsten link test 2016-11-21 19:19:34 -08:00
Dan Finlay
be6b7b496a Fixed account link test for ropsten network 2016-11-21 19:18:46 -08:00
Dan Finlay
aefc346a65 Bump changelog 2016-11-21 19:14:22 -08:00
Dan Finlay
3e4485d1cb Merge branch 'master' into i834-RopstenLinks 2016-11-21 19:13:45 -08:00
Dan Finlay
7d38c4ccb6 Add ropsten link support 2016-11-21 19:11:55 -08:00
Dan Finlay
17d63acaed Fix camel casing on setSelectedAccount action. 2016-11-21 18:16:59 -08:00
Dan Finlay
3577aa4649 Added instructions for installing local build 2016-11-21 18:16:45 -08:00
Kevin Serrano
1cbab788ec
Change fauceting to become a response of an emit. 2016-11-21 16:46:26 -08:00
Kevin Serrano
f5b0795ac5
change all instances of selectedAddress to selectedAccount. 2016-11-21 16:21:16 -08:00
Kevin Serrano
9123e70434
Remove entropy from encryption and project. 2016-11-21 15:49:03 -08:00
kumavis
1142d71048 Merge pull request #838 from MetaMask/Version-2.13.9
Version 2.13.9
2016-11-21 16:29:33 -05:00
Dan Finlay
1ddc7625e0 Version 2.13.9 2016-11-21 12:24:27 -08:00
Kevin Serrano
7cf6e372eb Merge pull request #837 from MetaMask/FixMenuItem
Fix custom provider menu item
2016-11-21 12:19:54 -08:00
Kevin Serrano
db5a4eab71 Merge pull request #833 from MetaMask/i831-AddRopsten-Dev
Begin adding Ropsten support to dev
2016-11-21 12:18:31 -08:00
Kevin Serrano
b4bee4fb59 Merge pull request #832 from MetaMask/i831-AddRopsten
Begin adding Ropsten support
2016-11-21 12:17:46 -08:00
Dan Finlay
bb06f5803d Add development states.js back into repo 2016-11-21 11:54:16 -08:00
Dan Finlay
6ae2400ef2 Fix custom provider menu item
The Custom RPC menu item in the provider menu would not appear when Localhost:8545 was selected.
2016-11-21 11:45:31 -08:00