Commit Graph

1801 Commits (606c0b761827df86ded4763a67f38a98738014e8)
 

Author SHA1 Message Date
Dan Finlay 606c0b7618 Remove callback type check 8 years ago
Dan Finlay a67b4d7131 Fix etherscan link generation test 8 years ago
Dan Finlay 0289444fcb Merge branch 'dev' into i842-WaitForSeedWord 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 17669e4af8
Make ropsten faucet button point at the correct url. 8 years ago
Dan Finlay ea56426b23 Use callback in placeSeedWord method. 8 years ago
Dan Finlay 60afc41bb6 Fix keyring test 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 be6b7b496a Fixed account link test for ropsten network 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
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
Kevin Serrano 3cd839d27f
Create failing test to check submitPassword in keyringController. 8 years ago
Kevin Serrano 626903e9f2 Merge pull request #823 from MetaMask/FixBork 8 years ago
Dan Finlay ce1c5eb75a Update migration code for new hd wallet param name 8 years ago
Kevin Serrano cd2442e3e7
Persist keyrings from migration to storage. 8 years ago
Kevin Serrano bef023fb4a
Resolve merge conflict. 8 years ago
kumavis 39e0a33bba random-id - use Number.MAX_SAFE_INTEGER as max 8 years ago
kumavis 6400eb8453 Merge pull request #816 from MetaMask/i328-MultiVault 8 years ago
kumavis 37d836fa72 Merge pull request #819 from MetaMask/i791-FixLosingConnection 8 years ago
Dan Finlay 8eb91e89bf Increment tx ids to avoid collisions 8 years ago
Dan Finlay 4352c7031a Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 8 years ago
Dan Finlay f229d32442 Replace old random-id code with incrementing id generator 8 years ago
kumavis b0ccde66f6 Merge pull request #814 from MetaMask/Version-2.13.8 8 years ago
Dan Finlay a4eadddd6b Version 2.13.8 8 years ago
Kevin Serrano 592b64a19f
Revert one cb to previous state. 8 years ago
Kevin Serrano 5bfb700fa8
Minimize dispatches by using emitters and relying on state updates. 8 years ago
Kevin Serrano e18109f1ea
Fix semantics in comments 8 years ago
Kevin Serrano 585284cb88
Lints. 8 years ago
Kevin Serrano 2ae62a4573
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 8 years ago
Kevin Serrano 64296df309
Resolve merge conflicts. 8 years ago
Kevin Serrano 14e6b92e29
Resolve merge conflicts. 8 years ago
Kevin Serrano 1db0bc4b2a
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 8 years ago
Kevin Serrano a4666de0ce
Minimize repeated code. 8 years ago
Kevin Serrano b1fee2a1d3
Minimize repeated code. 8 years ago
kumavis 68d5b459ed Merge pull request #811 from MetaMask/deadly-fix 8 years ago