Commit Graph

3235 Commits (27a0694d8519b302a14080f5b72ddf1c73e0d9a7)
 

Author SHA1 Message Date
kumavis 49a1f43736 Merge branch 'master' into i868-estimateGasTooHigh 8 years ago
kumavis fa2f0dee28 idStore - fix estimateGas calculation 8 years ago
kumavis 1a8d95f562 Merge pull request #871 from MetaMask/i860-ethjsremove 8 years ago
Kevin Serrano 6dad4f1f20
Phase out ethereumjs-util from encryptor module. 8 years ago
Dan Finlay 0289444fcb Merge branch 'dev' into i842-WaitForSeedWord 8 years ago
Kevin Serrano 8261cf232d
Merge branch 'dev' into dev-cleanup 8 years ago
kumavis b9d73a4b8f Merge pull request #864 from MetaMask/new-faucet 8 years ago
Dan Finlay cffe0c27f3 Merge branch 'master' into new-faucet 8 years ago
Dan Finlay ca819781cb Merge pull request #866 from MetaMask/new-faucet-dev 8 years ago
Kevin Serrano d92741c419 Merge pull request #856 from MetaMask/i835-OrganizeKeyrings 8 years ago
Kevin Serrano 2df6ebbd10 Merge pull request #855 from MetaMask/i834-RopstenLinks 8 years ago
Kevin Serrano 17669e4af8
Make ropsten faucet button point at the correct url. 8 years ago
Kevin Serrano 8d2afccdc0
Ropsten has sole access to the faucet. 8 years ago
Dan Finlay 136296aad6 Began moving salt into encryptor 8 years ago
Kevin Serrano 88ed1f191f
Add to changelog. 8 years ago
Dan Finlay ea56426b23 Use callback in placeSeedWord method. 8 years ago
Dan Finlay 9fb96128e6 Rename idStoreMigrator method for clarity 8 years ago
Dan Finlay 60afc41bb6 Fix keyring test 8 years ago
Dan Finlay e2a9e1cd4a Unify test wording 8 years ago
Dan Finlay 694f34ae9a Add temporary morden explorer link support 8 years ago
Dan Finlay ced36eb201 Improve Keyring organization 8 years ago
Dan Finlay ecfda5bcc5 Revert premature link test fix 8 years ago
Dan Finlay daec4d5c36 Fix ropsten link test 8 years ago
Dan Finlay be6b7b496a Fixed account link test for ropsten network 8 years ago
Dan Finlay aefc346a65 Bump changelog 8 years ago
Dan Finlay 3e4485d1cb Merge branch 'master' into i834-RopstenLinks 8 years ago
Dan Finlay 7d38c4ccb6 Add ropsten link support 8 years ago
Dan Finlay 17d63acaed Fix camel casing on setSelectedAccount action. 8 years ago
Dan Finlay 3577aa4649 Added instructions for installing local build 8 years ago
Kevin Serrano 1cbab788ec
Change fauceting to become a response of an emit. 8 years ago
Kevin Serrano f5b0795ac5
change all instances of selectedAddress to selectedAccount. 8 years ago
Kevin Serrano 9123e70434
Remove entropy from encryption and project. 8 years ago
kumavis 1142d71048 Merge pull request #838 from MetaMask/Version-2.13.9 8 years ago
Dan Finlay 1ddc7625e0 Version 2.13.9 8 years ago
Kevin Serrano 7cf6e372eb Merge pull request #837 from MetaMask/FixMenuItem 8 years ago
Kevin Serrano db5a4eab71 Merge pull request #833 from MetaMask/i831-AddRopsten-Dev 8 years ago
Kevin Serrano b4bee4fb59 Merge pull request #832 from MetaMask/i831-AddRopsten 8 years ago
Dan Finlay bb06f5803d Add development states.js back into repo 8 years ago
Dan Finlay 6ae2400ef2 Fix custom provider menu item 8 years ago
Dan Finlay 7ab9d40820 Merge branch 'dev' into i831-AddRopsten-Dev 8 years ago
Dan Finlay e8a8302624 Begin adding Ropsten support 8 years ago
Dan Finlay 268f6e10f3 Merge pull request #830 from MetaMask/kumavis-patch-1 8 years ago
kumavis 277bffc9b0 meta - README - add npm start to instructions 8 years ago
Dan Finlay 7021c7708c Merge pull request #827 from MetaMask/currency-cleanup 8 years ago
Dan Finlay cb0a9c7079 Merge pull request #826 from MetaMask/mini-lint 8 years ago
Kevin Serrano a07e5826ad
Convert conversion util to pure json. 8 years ago
Kevin Serrano d6286cd13a
Maintain linting. 8 years ago
Dan Finlay df5f99fa3b Merge pull request #824 from MetaMask/failing-tests 8 years ago
Kevin Serrano bc6312e9e3
Promisify persistence of keyrings before returning key 8 years ago
Kevin Serrano c695d54b01
Merge branch 'dev' into failing-tests 8 years ago