Commit Graph

1601 Commits (351c8e2086e043ee66e42f653dcb2b446dd88808)
 

Author SHA1 Message Date
Dan Finlay 351c8e2086 Merge branch 'master' into i328-MultiVault 8 years ago
Frankie 8d2ec8b820 Merge pull request #751 from MetaMask/ClarifyCallbackRole 8 years ago
Dan Finlay 7d7cb9af9d Fix background connection references 8 years ago
Dan Finlay 0deed17752 Fix tests 8 years ago
Dan Finlay 383f8ea7dc Linted & added salting to vault 8 years ago
Dan Finlay e5c95d68f8 Fix state updating after vault creation and unlocking 8 years ago
Dan Finlay 2132477797 Fix unlock logic 8 years ago
Dan Finlay f090828f99 Commented out useless advanced not on init screen 8 years ago
Dan Finlay f14fdf7a25 Change actions reference to keyringController to background 8 years ago
Dan Finlay 40f175c06f Linted 8 years ago
Dan Finlay 331bb735c7 Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault 8 years ago
Kevin Serrano 12698b9462
Resolve merge conflict. 8 years ago
Dan Finlay 090959470b Add note about callback param to sync method warning 8 years ago
Dan Finlay 94f2554369 Add debug flag to dev mode 8 years ago
Kevin Serrano afbc4c832b
Git merge resolution. 8 years ago
Kevin Serrano ad3fa24a28
Intermediary commit. 8 years ago
Kevin Serrano 725d503f68
Remove unused crypto dependencies. 8 years ago
Kevin Serrano 153bb25947
Add crypto packages to package.json 8 years ago
Kevin Serrano 17506fe14f
Merge in crypto. 8 years ago
Kevin Serrano a88a48ba14 Merge pull request #749 from MetaMask/Version-2.13.5 8 years ago
Dan Finlay f31fef034f Fix changelog date 8 years ago
Dan Finlay 182fd30db5 Fix cli flag capitalization 8 years ago
Dan Finlay 70f3d24e90 Version 2.13.5 8 years ago
Dan Finlay 60097d8fba Remove livereload from prod builds 8 years ago
kumavis a542118a55 Merge pull request #748 from MetaMask/i746-ReloadBug 8 years ago
Dan Finlay cc23158bfe Wait for first metamask data to establish ping-pong stream. 8 years ago
kumavis 0f0951ba54 Merge pull request #744 from MetaMask/i738-IncreaseGas 8 years ago
Dan Finlay 827d7553fc Restore hex prefix to gas price 8 years ago
Dan Finlay 91f43fa213 Increase gas estimate by 100000 wei 8 years ago
Kevin Serrano 101e839f9a Merge pull request #737 from MetaMask/Version-2.13.4 8 years ago
Dan Finlay 5864044538 Version 2.13.4 8 years ago
Dan Finlay 6d4c685636 Merge pull request #736 from MetaMask/i735-xmlfix 8 years ago
Kevin Serrano bc6092e111
Merge branch 'master' into i735-xmlfix 8 years ago
kumavis 11c114599c Merge pull request #720 from MetaMask/i#495CustomGasField 8 years ago
Kevin Serrano 0d495372da
Lint. 8 years ago
Kevin Serrano 91a8977d27
Bump changelog. 8 years ago
Kevin Serrano 8a5eacd35f
Prevent XML from web3 injections. 8 years ago
Kevin Serrano 1481a3ef8e
Initial work on UI side 8 years ago
Dan Finlay 036b0e4cca Linted 8 years ago
Dan Finlay 69aed23e9b Fixed vector usage in encryptor 8 years ago
Dan Finlay 1c791c4d2e Got basic encryptor working 8 years ago
Dan Finlay c9cfcd5253 Got encrypting working, not yet decrypting 8 years ago
Frankie 35232c5e29 Fix for linting 8 years ago
Frankie aace26c4bd Create callback and Clean-up details 8 years ago
Frankie 328f8b0cac fix spelling 8 years ago
Frankie 67eba9f542 Specify base 10 in bignumber 8 years ago
Frankie b200f74d5f Merge branch 'master' into i#495CustomGasField 8 years ago
Frankie c400f7c0f6 Fix gasPrice range 8 years ago
Dan Finlay cce8d9e360 Began adding browser-native encryptor module 8 years ago
Kevin Serrano 7cba71fc55
Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into origin/i328-MultiVault 8 years ago