Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add account adding subview placeholders | Dan Finlay | 2016-11-05 | 4 | -39/+121 |
| | |||||
* | Merge branch 'i328-MultiVault' into i328-MultiVault-v1 | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
|\ | |||||
| * | Fix network checking | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
| | | |||||
* | | Remove unused class | Dan Finlay | 2016-11-05 | 1 | -1/+1 |
| | | |||||
* | | Convert buy subview to new tab bar component | Dan Finlay | 2016-11-05 | 1 | -36/+47 |
| | | |||||
* | | Scaffold new account view | Dan Finlay | 2016-11-05 | 9 | -2/+192 |
|/ | |||||
* | Remove insane actions hash | Dan Finlay | 2016-11-05 | 1 | -6/+2 |
| | |||||
* | Add tolerance to normalize method | Dan Finlay | 2016-11-04 | 1 | -0/+1 |
| | |||||
* | Fix password validation and persistence issue | Dan Finlay | 2016-11-04 | 3 | -4/+30 |
| | | | | Was wiping the vault on each successful password attempt... :P | ||||
* | Implement private key exporting. | Kevin Serrano | 2016-11-04 | 2 | -3/+22 |
| | |||||
* | Finish fixing nicknaming bug | Dan Finlay | 2016-11-04 | 2 | -28/+70 |
| | |||||
* | Fix account nicknaming bug | Dan Finlay | 2016-11-04 | 3 | -3/+19 |
| | | | | When nicknaming, we weren't normalizing the input, and so we were retrieving with differently formatted addresses than we were persisting. | ||||
* | Fix vault creation bug | Dan Finlay | 2016-11-04 | 2 | -25/+41 |
| | |||||
* | Set test env during tests | Dan Finlay | 2016-11-04 | 1 | -1/+1 |
| | |||||
* | Don't faucet during tests | Dan Finlay | 2016-11-04 | 1 | -1/+2 |
| | |||||
* | Don't faucet in development | Dan Finlay | 2016-11-04 | 1 | -1/+3 |
| | |||||
* | Fix dual vault creation bug | Dan Finlay | 2016-11-03 | 2 | -12/+16 |
| | |||||
* | Fix initial vault creation | Dan Finlay | 2016-11-03 | 1 | -4/+8 |
| | |||||
* | Fix handling of migrating old vault style | Dan Finlay | 2016-11-03 | 5 | -56/+114 |
| | | | | | | Now old vaults are recognized as an "Initialized" MetaMask instance. Upon logging in, when fetching the initial password-derived key, if there is no new-style vault, but there is an old style vault, it is migrated to the new format before proceeding through the usual unlocking steps. | ||||
* | Add reveal of seed words. | Kevin Serrano | 2016-11-02 | 5 | -2/+52 |
| | |||||
* | Make identicon tolerant of changing state | Dan Finlay | 2016-11-02 | 1 | -0/+17 |
| | |||||
* | Fixed bugs related to clearing caches when restoring to a new vault | Dan Finlay | 2016-11-02 | 6 | -13/+54 |
| | |||||
* | Make forgot password button. | Dan Finlay | 2016-11-02 | 3 | -32/+23 |
| | |||||
* | Remove and untrack npm debug files | Dan Finlay | 2016-11-02 | 2 | -46/+1 |
| | |||||
* | Fix seed phrase restore | Dan Finlay | 2016-11-02 | 3 | -5/+4 |
| | |||||
* | Made progress on parity for MultiVault | Kevin Serrano | 2016-11-02 | 10 | -199/+103 |
| | | | | | | | | | - Deleted some unused items - Renamed files and paths to match with new locations. - Modified keyring controller logic to separate concerns. - Fix account naming issues. - Enable creation of new vault with default HD keyring. - Formatting issues. | ||||
* | Do not open MM page in dev mode. | Kevin Serrano | 2016-11-02 | 1 | -1/+2 |
| | |||||
* | Linted | Kevin Serrano | 2016-11-01 | 2 | -1/+46 |
| | |||||
* | Implement seed word confirmation page. | Kevin Serrano | 2016-11-01 | 9 | -12/+53 |
| | | | | | Remove logs. Move HD render files to ui/app. | ||||
* | Implement auto-fauceting | Kevin Serrano | 2016-11-01 | 1 | -1/+6 |
| | |||||
* | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-31 | 5 | -16/+142 |
|\ | | | | | | | i328-MultiVault | ||||
| * | Now migrating old vaults to new DEN format | Dan Finlay | 2016-10-29 | 5 | -16/+142 |
| | | |||||
* | | Make case condition more consistent. Remove extra action. Fix incorrect ↵ | Kevin Serrano | 2016-10-31 | 2 | -2/+3 |
| | | | | | | | | display of network. | ||||
* | | Add focus to password field. | Kevin Serrano | 2016-10-31 | 1 | -0/+4 |
| | | |||||
* | | Add password warning div. | Kevin Serrano | 2016-10-31 | 1 | -2/+7 |
| | | |||||
* | | Modify first-screen design to match docs. | Kevin Serrano | 2016-10-31 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-29 | 13 | -30/+465 |
|\| | | | | | | | i328-MultiVault | ||||
| * | Add vault migration test | Dan Finlay | 2016-10-29 | 1 | -0/+91 |
| | | |||||
| * | Configure BIP44 Keychain as default one | Dan Finlay | 2016-10-29 | 4 | -11/+44 |
| | | |||||
| * | Added hd wallet tests | Dan Finlay | 2016-10-28 | 2 | -4/+109 |
| | | |||||
| * | Add hd wallet keyring | Dan Finlay | 2016-10-28 | 2 | -0/+79 |
| | | |||||
| * | Fix identicon rendering | Dan Finlay | 2016-10-28 | 1 | -7/+6 |
| | | |||||
| * | Update first screen to match design. | Dan Finlay | 2016-10-28 | 2 | -10/+99 |
| | | |||||
| * | Add latest jazzicon version | Dan Finlay | 2016-10-28 | 1 | -1/+1 |
| | | |||||
| * | Add first-time state | Dan Finlay | 2016-10-28 | 2 | -1/+40 |
| | | |||||
| * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-10-26 | 20 | -205/+7 |
| |\ | | | | | | | | | | i328-MultiVault | ||||
| * \ | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-26 | 4 | -14/+35 |
| |\ \ | |||||
* | \ \ | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-29 | 12 | -42/+76 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Merge pull request #778 from MetaMask/mascara-build | kumavis | 2016-10-27 | 3 | -11/+1 |
| |\ \ \ | | | | | | | | | | | Mascara build | ||||
| | * | | | mascara - remove global transpile | kumavis | 2016-10-27 | 2 | -10/+0 |
| | | | | | |||||
| | * | | | mascara - example dapp - log main account | kumavis | 2016-10-27 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #774 from MetaMask/walkThrough | Dan Finlay | 2016-10-27 | 2 | -4/+21 |
| |\ \ \ | | | | | | | | | | | Add more info to mascara README | ||||
| | * \ \ | Merge branch 'master' into walkThrough | Frankie | 2016-10-27 | 2 | -1/+2 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #767 from MetaMask/UpdateWeb3 | kumavis | 2016-10-27 | 2 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Update web3.js version | ||||
| | * \ \ \ | Merge branch 'master' into UpdateWeb3 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge branch 'master' into UpdateWeb3 | Dan Finlay | 2016-10-27 | 4 | -12/+15 |
| | |\ \ \ \ | |||||
| | * | | | | | deps - web3 - set version to 0.17.0-beta | kumavis | 2016-10-27 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Update web3.js version | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| | | |_|_|/ | | |/| | | | |||||
| | | | * | | Fix typos and clean up | Frankie | 2016-10-27 | 2 | -2/+1 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' into walkThrough | Frankie | 2016-10-27 | 5 | -11/+15 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge pull request #773 from MetaMask/Version-2.13.62.13.6 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Version 2.13.6 | ||||
| | * | | | | Version 2.13.6 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #768 from MetaMask/i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 2 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | Rename wallet to account | ||||
| | * \ \ \ | Merge branch 'master' into i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 3 | -9/+10 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #764 from MetaMask/761-FixCustomMordenIndication | Kevin Serrano | 2016-10-27 | 3 | -9/+10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix provider menu selection indication | ||||
| | * \ \ \ \ | Merge branch 'master' into 761-FixCustomMordenIndication | Dan Finlay | 2016-10-27 | 2 | -2/+3 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Bump changelog | Dan Finlay | 2016-10-26 | 1 | -0/+2 |
| | | | | | | | |||||
| | * | | | | | Fix provider menu selection indication | Dan Finlay | 2016-10-26 | 2 | -9/+8 |
| | | |/ / / | | |/| | | | |||||
| | | * | | | Merge branch 'master' into i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 2 | -2/+3 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||||
| | | * | | | Rename wallet to account | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| | |/ / / | | | | | | | | | | | | | | | | Fixes #762 | ||||
| | | * | | Fix the size of the pop-up | Frankie | 2016-10-27 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Add more info about first use | Frankie | 2016-10-27 | 1 | -1/+19 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #769 from MetaMask/FixDelegateCall | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | Fix delegate call function reference 2 | ||||
| | * | | | Fix delegate call function reference 2 | Dan Finlay | 2016-10-26 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge pull request #766 from MetaMask/FixDelegateCallCheck | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| |\ \ \ | | |/ / | |/| | | Fix delegate call analysis | ||||
| | * | | Fix delegate call analysis | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| |/ / | | | | | | | | | | Fixed reference allowing transactions to be analyzed for delegate call again. | ||||
| * | | Merge pull request #745 from MetaMask/i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 4 | -14/+35 |
| |\ \ | | | | | | | | | Reproduced issue 743 in test case | ||||
| | * | | test - fix delegate-call test | kumavis | 2016-10-25 | 4 | -12/+10 |
| | | | | |||||
| | * | | Merge branch 'master' into i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 5 | -2/+37 |
| | |\ \ | | |/ / | |/| | | |||||
| | * | | Merge branch 'master' into i743-FixDelegateCallFlag | Kevin Serrano | 2016-10-19 | 4 | -3/+7 |
| | |\ \ | |||||
| | * | | | Reproduced issue 743 in test case | Dan Finlay | 2016-10-18 | 3 | -12/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This contract hex does include the value `f4`, but it was compiled from a contract with no instance of `.delegatecall`. I believe `f4` in this case is part of some other value or contract address, and `ethBinToOps` has some error in how it skips pushed data. @kumavis | ||||
* | | | | | Remove debugger statement. | Kevin Serrano | 2016-10-26 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Phase out extra warning screen. | Kevin Serrano | 2016-10-26 | 20 | -205/+8 |
| | | | | | |||||
* | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-24 | 15 | -87/+712 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | i328-MultiVault | ||||
| * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-22 | 4 | -1/+36 |
| |\| | | | |||||
| * | | | | Fix duplicate provider menu item bug | Dan Finlay | 2016-10-22 | 1 | -6/+1 |
| | | | | | |||||
| * | | | | Fix loading indication | Dan Finlay | 2016-10-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added tx & msg managing functionality to new KeyringController | Dan Finlay | 2016-10-22 | 2 | -1/+150 |
| | | | | | |||||
| * | | | | Fix bug in new KeyringController vault restoring logic. | Dan Finlay | 2016-10-22 | 3 | -3/+74 |
| | | | | | |||||
| * | | | | Create new vault before each keyringController unit test | Dan Finlay | 2016-10-22 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | Create basic keyring-controller unit test file | Dan Finlay | 2016-10-22 | 4 | -32/+83 |
| | | | | | |||||
| * | | | | Added SimpleKeyring tests | Dan Finlay | 2016-10-22 | 4 | -18/+110 |
| | | | | | |||||
| * | | | | Added tx and msg signing to keychain & controller | Dan Finlay | 2016-10-21 | 4 | -39/+134 |
| | | | | | |||||
| * | | | | Improved simple account generation | Dan Finlay | 2016-10-21 | 3 | -35/+52 |
| | | | | | |||||
| * | | | | Began adding first basic keyring | Dan Finlay | 2016-10-21 | 8 | -13/+166 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-24 | 4 | -1/+36 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merge pull request #752 from MetaMask/i#741 | Dan Finlay | 2016-10-22 | 4 | -1/+36 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Add validations to txData param in send form | ||||
| | * | | | | Change regex in isHex function | Frankie | 2016-10-22 | 1 | -4/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741 | Frankie | 2016-10-22 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' into i#741 | Frankie | 2016-10-21 | 1 | -1/+1 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | clean up the isHex function | Frankie | 2016-10-22 | 1 | -3/+4 |
| | |/ / / / | |||||
| | * | | | | Clean up tests | Frankie | 2016-10-21 | 1 | -4/+4 |
| | | | | | | |||||
| | * | | | | Add test and ability for isHex to handle hex strings with hex-prefix | Frankie | 2016-10-20 | 2 | -0/+6 |
| | | | | | | |||||
| | * | | | | Fix up wording | Frankie | 2016-10-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Fix CHANGELOG | Frankie | 2016-10-20 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into i#741 | Frankie | 2016-10-20 | 4 | -3/+7 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | * | | | | Add unit test for isHex and add to CHANGELOG.md | Frankie | 2016-10-20 | 2 | -0/+18 |
| | | | | | | |||||
| | * | | | | Add valdations to txData param | Frankie | 2016-10-20 | 2 | -0/+12 |
| | | |_|/ | | |/| | | |||||
* | | | | | Merge branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-21 | 1 | -1/+1 |
|\| | | | | |_|_|/ |/| | | | |||||
| * | | | Merge pull request #751 from MetaMask/ClarifyCallbackRole | Frankie | 2016-10-21 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | Add note about callback param to sync method warning | ||||
| | * | | Add note about callback param to sync method warning | Dan Finlay | 2016-10-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Fix background connection references | Dan Finlay | 2016-10-21 | 2 | -2/+2 |
| | | | |||||
* | | | Fix tests | Dan Finlay | 2016-10-21 | 7 | -179/+16 |
| | | | |||||
* | | | Linted & added salting to vault | Dan Finlay | 2016-10-21 | 7 | -44/+31 |
| | | | |||||
* | | | Fix state updating after vault creation and unlocking | Dan Finlay | 2016-10-21 | 3 | -4/+11 |
| | | | |||||
* | | | Fix unlock logic | Dan Finlay | 2016-10-21 | 1 | -6/+17 |
| | | | |||||
* | | | Commented out useless advanced not on init screen | Dan Finlay | 2016-10-21 | 1 | -0/+2 |
| | | | |||||
* | | | Change actions reference to keyringController to background | Dan Finlay | 2016-10-21 | 2 | -25/+25 |
| | | | |||||
* | | | Linted | Dan Finlay | 2016-10-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-10-21 | 27 | -120/+483 |
|\ \ \ | | | | | | | | | | | | | i328-MultiVault | ||||
| * \ \ | Resolve merge conflict. | Kevin Serrano | 2016-10-20 | 0 | -0/+0 |
| |\ \ \ | |||||
| * \ \ \ | Git merge resolution. | Kevin Serrano | 2016-10-20 | 14 | -45/+267 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge pull request #749 from MetaMask/Version-2.13.5 | Kevin Serrano | 2016-10-19 | 3 | -2/+4 |
| | |\ \ \ | | | | | | | | | | | | | Version 2.13.5 | ||||
| | | * | | | Fix changelog date | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Fix cli flag capitalization | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Version 2.13.5v2.13.5 | Dan Finlay | 2016-10-19 | 2 | -1/+3 |
| | | | | | | |||||
| | | * | | | Remove livereload from prod builds | Dan Finlay | 2016-10-19 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #748 from MetaMask/i746-ReloadBug | kumavis | 2016-10-19 | 2 | -1/+3 |
| | |\ \ \ | | | |_|/ | | |/| | | Wait for first metamask data to establish ping-pong stream. | ||||
| | | * | | Wait for first metamask data to establish ping-pong stream. | Dan Finlay | 2016-10-19 | 2 | -1/+3 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | Prevents infinite reload loops when dapps take too long to load. Fixes #746. | ||||
| | * | | Merge pull request #744 from MetaMask/i738-IncreaseGas | kumavis | 2016-10-18 | 3 | -1/+29 |
| | |\ \ | | | | | | | | | | | Increase gas estimate by 100000 wei | ||||
| | | * | | Restore hex prefix to gas price | Dan Finlay | 2016-10-18 | 2 | -1/+2 |
| | | | | | |||||
| | | * | | Increase gas estimate by 100000 wei | Dan Finlay | 2016-10-18 | 3 | -1/+28 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738. | ||||
| | * | | Merge pull request #737 from MetaMask/Version-2.13.4 | Kevin Serrano | 2016-10-18 | 3 | -2/+5 |
| | |\ \ | | | | | | | | | | | Version 2.13.4 | ||||
| | | * | | Version 2.13.4 | Dan Finlay | 2016-10-18 | 3 | -2/+5 |
| | |/ / | |||||
| | * | | Merge pull request #736 from MetaMask/i735-xmlfix | Dan Finlay | 2016-10-18 | 2 | -2/+15 |
| | |\ \ | | | | | | | | | | | Prevent injections on XML | ||||
| | | * \ | Merge branch 'master' into i735-xmlfix | Kevin Serrano | 2016-10-18 | 9 | -38/+213 |
| | | |\ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge pull request #720 from MetaMask/i#495CustomGasField | kumavis | 2016-10-17 | 9 | -38/+214 |
| | |\ \ \ | | | | | | | | | | | | | add a gasPrice field | ||||
| | | * | | | Fix for linting | Frankie | 2016-10-14 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Create callback and Clean-up details | Frankie | 2016-10-14 | 4 | -12/+19 |
| | | | | | | |||||
| | | * | | | fix spelling | Frankie | 2016-10-14 | 1 | -4/+2 |
| | | | | | | |||||
| | | * | | | Specify base 10 in bignumber | Frankie | 2016-10-14 | 2 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-14 | 8 | -37/+59 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Fix gasPrice range | Frankie | 2016-10-14 | 8 | -20/+37 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-12 | 16 | -83/+365 |
| | | |\ \ \ | |||||
| | | * | | | | Add to CHANGELOG | Frankie | 2016-10-11 | 1 | -0/+2 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'master' into i#495CustomGasField | Frankie | 2016-10-11 | 14 | -33/+58 |
| | | |\ \ \ \ | |||||
| | | * | | | | | Add custom gas field to send page | Frankie | 2016-10-11 | 4 | -33/+185 |
| | | | | | | | | |||||
| | | | | | * | | Lint. | Kevin Serrano | 2016-10-16 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | | | | * | | Bump changelog. | Kevin Serrano | 2016-10-16 | 1 | -0/+2 |
| | | | | | | | | |||||
| | | | | | * | | Prevent XML from web3 injections. | Kevin Serrano | 2016-10-16 | 1 | -2/+14 |
| | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Intermediary commit. | Kevin Serrano | 2016-10-20 | 9 | -37/+77 |
| | | | | | | | |||||
| * | | | | | | Remove unused crypto dependencies. | Kevin Serrano | 2016-10-20 | 2 | -4/+0 |
| | | | | | | | |||||
| * | | | | | | Add crypto packages to package.json | Kevin Serrano | 2016-10-20 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | Merge in crypto. | Kevin Serrano | 2016-10-20 | 9 | -5/+195 |
| | | | | | | | |||||
| * | | | | | | Initial work on UI side | Kevin Serrano | 2016-10-16 | 6 | -1/+82 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-10-13 | 11 | -144/+467 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | origin/i328-MultiVault | ||||
| * | | | | | | Merge pull request #730 from MetaMask/i695-dapp-reload | kumavis | 2016-10-13 | 7 | -35/+57 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | dapp reload - fixed disconnect detection via polling | ||||
| | * \ \ \ \ \ | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #733 from MetaMask/tos-fix | Kevin Serrano | 2016-10-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Fix misnamed variable. | ||||
| | * | | | | | | Remove logs. | Kevin Serrano | 2016-10-13 | 1 | -2/+0 |
| | | | | | | | | |||||
| | * | | | | | | Fix misnamed variable. | Kevin Serrano | 2016-10-13 | 1 | -2/+4 |
| |/ / / / / / | |||||
| | * | | | | | Merge branch 'master' into i695-dapp-reload | kumavis | 2016-10-13 | 16 | -83/+365 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | dapp reload - fixed disconnect detection via polling | kumavis | 2016-10-13 | 7 | -35/+57 |
| | | |_|/ / | | |/| | | | |||||
* | | | | | | Add debug flag to dev mode | Dan Finlay | 2016-10-20 | 1 | -2/+2 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Linted | Dan Finlay | 2016-10-15 | 2 | -10/+5 |
| | | | | | |||||
* | | | | | Fixed vector usage in encryptor | Dan Finlay | 2016-10-15 | 1 | -3/+17 |
| | | | | | |||||
* | | | | | Got basic encryptor working | Dan Finlay | 2016-10-15 | 2 | -14/+61 |
| | | | | | |||||
* | | | | | Got encrypting working, not yet decrypting | Dan Finlay | 2016-10-15 | 5 | -115/+51 |
| | | | | | |||||
* | | | | | Began adding browser-native encryptor module | Dan Finlay | 2016-10-13 | 8 | -3/+201 |
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new Qunit build process that will browserify the contents of `test/integration/lib` into the QUnit browser, allowing much more modular testing, including unit testing of our modules in our target browsers. Made a basic unit test file of this form for the new encryptor module, which fails miserably because I've only just begun to work with it. I've started with this blog post as a starting point, and will be adjusting it to our needs from there: http://qnimate.com/passphrase-based-encryption-using-web-cryptography-api/ | ||||
* | | | | Add minimal method signatures to new keyring controller | Dan Finlay | 2016-10-13 | 3 | -15/+94 |
| | | | | |||||
* | | | | Remove additional deprecated action | Dan Finlay | 2016-10-13 | 1 | -15/+0 |
| | | | | |||||
* | | | | Remove opinionated seed word code | Dan Finlay | 2016-10-13 | 7 | -116/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work. | ||||
* | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-10-13 | 16 | -83/+365 |
|\| | | | |||||
| * | | | Merge pull request #723 from MetaMask/i721-ScrollAccountList | Frankie | 2016-10-12 | 4 | -34/+69 |
| |\ \ \ | | | | | | | | | | | I721 scroll account list | ||||
| | * \ \ | Merge branch 'master' into i721-ScrollAccountList | Dan Finlay | 2016-10-12 | 13 | -49/+296 |
| | |\ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge pull request #702 from MetaMask/tos | Dan Finlay | 2016-10-12 | 13 | -49/+296 |
| |\ \ \ \ | | |_|/ / | |/| | | | Terms of Service UI Update | ||||
| | * | | | Remove logs. | Kevin Serrano | 2016-10-12 | 1 | -3/+0 |
| | | | | | |||||
| | * | | | Remove comments. | Kevin Serrano | 2016-10-12 | 1 | -16/+0 |
| | | | | | |||||
| | * | | | Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos | Kevin Serrano | 2016-10-12 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | | * | | | Fix bug where new vaults had no nicknames | Dan Finlay | 2016-10-12 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Cleanup. | Kevin Serrano | 2016-10-12 | 4 | -13/+26 |
| | |/ / / | |||||
| | * | | | lint | Kevin Serrano | 2016-10-12 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Move tos hash comparison logic from background to mm controller. | Kevin Serrano | 2016-10-12 | 2 | -27/+16 |
| | | | | | |||||
| | * | | | Remove version from terms of service. | Kevin Serrano | 2016-10-12 | 1 | -3/+1 |
| | | | | | |||||
| | * | | | Move tos hash logic to build phase. Create dynamic global variables based on ↵ | Kevin Serrano | 2016-10-12 | 4 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | build. | ||||
| | * | | | Modify changelog. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Prevent back/login buttons from appearing on the terms of service. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Fix linting and guarantees set TOS hash. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Fix retention of terms of service hash across reloads of plugin. | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Renamed variables to make more sense. | Kevin Serrano | 2016-10-07 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Add missing path require statement. | Kevin Serrano | 2016-10-07 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Merge branch 'tos' into tosplusupdatecheck | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'master' into tos | Kevin Serrano | 2016-10-07 | 1 | -1/+1 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | On update, check whether the TOS has changed using hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+16 |
| | | | | | | |||||
| | * | | | | Add controller functions for storing and checking TOS hashes. | Kevin Serrano | 2016-10-06 | 1 | -1/+34 |
| | | | | | | |||||
| | * | | | | Add new functions for storing TOS hashes in config manager. | Kevin Serrano | 2016-10-06 | 1 | -0/+11 |
| | | | | | | |||||
| | * | | | | Add string-hash as a package. | Kevin Serrano | 2016-10-06 | 1 | -0/+1 |
| | |/ / / | |||||
| | * | | | Merge branch 'master' into tos | Kevin Serrano | 2016-10-06 | 8 | -10/+21 |
| | |\ \ \ | |||||
| | * | | | | Fix integration test. | Kevin Serrano | 2016-10-06 | 1 | -8/+15 |
| | | | | | | |||||
| | * | | | | Rewritten to react standards. Way easier. | Kevin Serrano | 2016-10-05 | 2 | -10/+9 |
| | | | | | | |||||
| | * | | | | Linting. | Kevin Serrano | 2016-10-05 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Add to changelog. | Kevin Serrano | 2016-10-05 | 1 | -0/+3 |
| | | | | | | |||||
| | * | | | | Rename drop menu item to be consistent with naming. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add relevant legal links to help page. | Kevin Serrano | 2016-10-05 | 1 | -8/+41 |
| | | | | | | |||||
| | * | | | | Make config page title consistent with menu item. | Kevin Serrano | 2016-10-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add links to relevant legal pages on user agreement page. | Kevin Serrano | 2016-10-05 | 2 | -5/+14 |
| | | | | | | |||||
| | * | | | | Add conditional logic for adding listener. | Kevin Serrano | 2016-10-05 | 1 | -3/+5 |
| | | | | | | |||||
| | * | | | | Add padding to markdown paragraphs. | Kevin Serrano | 2016-10-05 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-10-05 | 10 | -26/+40 |
| | |\ \ \ \ | |||||
| | * | | | | | Add CSS rules for proper formatting. | Kevin Serrano | 2016-10-05 | 1 | -1/+7 |
| | | | | | | | |||||
| | * | | | | | Modify USER_AGREEMENT to be formatted properly. | Kevin Serrano | 2016-10-05 | 1 | -36/+37 |
| | | | | | | | |||||
| | * | | | | | Implemented scroll-to-bottom functionality for button activation. | Kevin Serrano | 2016-10-05 | 1 | -2/+10 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-10-03 | 9 | -20/+36 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-09-19 | 13 | -32/+114 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Modify terms. | Kevin Serrano | 2016-09-19 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into tos | Kevin Serrano | 2016-09-15 | 5 | -20/+23 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Modify user agreement | Kevin Serrano | 2016-09-15 | 1 | -28/+148 |
| | | | | | | | | | |||||
| | | | | | | | * | Bump changelog | Dan Finlay | 2016-10-12 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | | | | | | * | Remove flex class from account list container | Dan Finlay | 2016-10-12 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | | | | | | * | Add more accounts to account list ui state | Dan Finlay | 2016-10-12 | 2 | -33/+67 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Add initial KeyringController files | Dan Finlay | 2016-10-12 | 2 | -0/+183 |
| | | | | | | | | |||||
* | | | | | | | | Add to doc | Dan Finlay | 2016-10-12 | 1 | -0/+13 |
| | | | | | | | | |||||
* | | | | | | | | Add multi-vault planning doc | Dan Finlay | 2016-10-08 | 1 | -0/+175 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #710 from MetaMask/EmphasizeAutoUpdating | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Emphasize auto-updating in announcement | ||||
| * | | | | | | Emphasize auto-updating in announcement | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Helps avoid issues like #703 by emphasizing uninstalling is not required. | ||||
* | | | | | | Merge pull request #709 from MetaMask/i707-MixedCaseAddresses | Dan Finlay | 2016-10-06 | 3 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add tolerance for mixed case addresses | ||||
| * | | | | | | Made announcer use correct text bolding | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Add tolerance for sending from mixed-case addresses. | Dan Finlay | 2016-10-06 | 2 | -3/+3 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses. Fixes #707 | ||||
* | | | | | | Merge pull request #708 from MetaMask/LittleFixes2.13.3 | Dan Finlay | 2016-10-06 | 4 | -6/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Little fixes | ||||
| * | | | | | | Bump provider-engine version | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Correct async link | Dan Finlay | 2016-10-06 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Add extension store description for easy reference | Dan Finlay | 2016-10-06 | 1 | -0/+8 |
| | | | | | | | |||||
| * | | | | | | Rebuild dev states | Dan Finlay | 2016-10-06 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #701 from MetaMask/Version-2.13.3 | kumavis | 2016-10-05 | 3 | -2/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Version 2.13.3 | ||||
| * | | | | | Merge branch 'master' of github.com:MetaMask/metamask-plugin into Version-2.13.3 | kumavis | 2016-10-05 | 8 | -4/+21 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #696 from MetaMask/SmallerCopiedButton | kumavis | 2016-10-05 | 3 | -1/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Formatting Fixes | ||||
| * \ \ \ \ \ | Merge branch 'master' into SmallerCopiedButton | kumavis | 2016-10-05 | 5 | -3/+17 |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge pull request #694 from MetaMask/AddAnnouncerScript | kumavis | 2016-10-05 | 2 | -1/+14 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add announcer script | ||||
| * \ \ \ \ \ \ | Merge branch 'master' into AddAnnouncerScript | kumavis | 2016-10-05 | 5 | -5/+10 |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #700 from MetaMask/OperaCompatibility | kumavis | 2016-10-05 | 3 | -2/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add Opera compatibility | ||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into OperaCompatibility | Dan Finlay | 2016-10-05 | 2 | -3/+7 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Add Opera compatibility | Dan Finlay | 2016-10-05 | 3 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix incorrect OS key - Add additional icon image sizes. | ||||
| | * | | | | | | | Add announcer script | Dan Finlay | 2016-10-05 | 2 | -1/+14 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I always keep writing up this same announcement message whenever I publish a new version. I've now written a script to automate my announcement formatting, it looks like this: ``` **MetaMask 2.13.2** now published to the Chrome Store! It should be available over the next hour! 2016-10-4 - Fix bug where chosen FIAT exchange rate does no persist when switching networks - Fix additional parameters that made MetaMask sometimes receive errors from Parity. - Fix bug where invalid transactions would still open the MetaMask popup. ``` | ||||
| | * | | | | | | Merge branch 'master' into SmallerCopiedButton | Frankie | 2016-10-05 | 2 | -3/+7 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| | * | | | | | | Bump changelog | Dan Finlay | 2016-10-05 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Make popup a little taller | Dan Finlay | 2016-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the popup was often cutting off the bottom buttons of the UI. We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now. | ||||
| | * | | | | | | Make seed word confirmation button font smaller | Dan Finlay | 2016-10-05 | 2 | -0/+3 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | To avoid formatting glitches on some machines. | ||||
| | * / / / / | Version 2.13.3 | Dan Finlay | 2016-10-05 | 3 | -2/+6 |
| |/ / / / / |/| | | | | | | | | | | | | | | | | | Bumps provider-engine to fix log query filtering bug. | ||||
* | | | | | | Merge pull request #697 from MetaMask/StripPrivateKeyPrefix | Frankie | 2016-10-05 | 2 | -3/+7 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Removed hex prefix from private key export |