Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert one cb to previous state. | Kevin Serrano | 2016-11-16 | 2 | -2/+2 |
* | Minimize dispatches by using emitters and relying on state updates. | Kevin Serrano | 2016-11-16 | 2 | -26/+12 |
* | Fix semantics in comments | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
* | Lints. | Kevin Serrano | 2016-11-16 | 1 | -1/+1 |
* | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-11-16 | 0 | -0/+0 |
|\ | |||||
| * | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 3 | -5/+5 |
| |\ | |||||
* | \ | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 3 | -5/+5 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge pull request #811 from MetaMask/deadly-fix | kumavis | 2016-11-15 | 3 | -4/+4 |
| |\ | |||||
| | * | Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix | Kevin Serrano | 2016-11-15 | 0 | -0/+0 |
| | |\ | |||||
| | | * | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 2 | -4/+3 |
| | |/ | |/| | |||||
| | * | Add to changelog. | Kevin Serrano | 2016-11-15 | 1 | -0/+1 |
| | * | First attempt at fixing errors in confirmation screen. | Kevin Serrano | 2016-11-15 | 2 | -4/+3 |
| |/ | |||||
* | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-11-16 | 1 | -0/+2 |
|\ \ | |||||
| * | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 1 | -5/+6 |
* | | | Minimize repeated code. | Kevin Serrano | 2016-11-16 | 2 | -8/+7 |
|/ / | |||||
* | | Re-enable disclaimer screen. Rename variables to reflect role more clearly. | Kevin Serrano | 2016-11-15 | 30 | -49/+49 |
* | | Add idStore tests again. | Kevin Serrano | 2016-11-15 | 1 | -0/+198 |
* | | Rename n variables to numberOfAccounts inside of test suite. Remove idStore t... | Kevin Serrano | 2016-11-12 | 3 | -203/+4 |
* | | Revert to previous anonymous function for promise. | Kevin Serrano | 2016-11-12 | 1 | -1/+3 |
* | | Various keyring changes | Kevin Serrano | 2016-11-12 | 1 | -18/+10 |
* | | Clarify functions names. Package normalize inside util file. Fix require head... | Kevin Serrano | 2016-11-12 | 1 | -11/+8 |
* | | Package normalize inside sig util file. | Kevin Serrano | 2016-11-12 | 1 | -0/+5 |
* | | Fix lint rules for ternary operator placement. | Kevin Serrano | 2016-11-12 | 2 | -19/+19 |
* | | Typo fix. | Kevin Serrano | 2016-11-12 | 1 | -9/+9 |
* | | Linting to the max. | Kevin Serrano | 2016-11-12 | 32 | -177/+129 |
* | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 2 | -2/+6 |
|\| | |||||
| * | Merge pull request #807 from MetaMask/cssIsAwesome | kumavis | 2016-11-11 | 2 | -2/+6 |
| |\ | |||||
| | * | lint fix | Frankie | 2016-11-11 | 1 | -1/+2 |
| | * | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 2 | -2/+5 |
| |/ | |||||
* | | Merge branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 3 | -2/+26 |
|\| | |||||
| * | Merge pull request #805 from MetaMask/i804 | kumavis | 2016-11-11 | 3 | -2/+26 |
| |\ | |||||
| | * | changelog - update | kumavis | 2016-11-11 | 1 | -0/+1 |
| | * | detect tx error - show warning and fix gasLimit | kumavis | 2016-11-11 | 2 | -2/+25 |
| |/ | |||||
* | | Merge pull request #802 from MetaMask/confTxFix | Kevin Serrano | 2016-11-11 | 9 | -28/+33 |
|\ \ | |||||
| * | | fix tx data so it has the network id | Frankie | 2016-11-11 | 2 | -2/+9 |
| * | | Merge branch 'master' into i328-MultiVault | Frankie | 2016-11-11 | 8 | -26/+24 |
|/| | | |/ | |||||
| * | Merge pull request #801 from MetaMask/deadly | Kevin Serrano | 2016-11-10 | 6 | -18/+14 |
| |\ | |||||
| | * | remove gas field, due to alias redundancy. | Kevin Serrano | 2016-11-10 | 1 | -1/+0 |
| | * | Fix bug for increasing gas by 20 percent. | Kevin Serrano | 2016-11-10 | 3 | -1/+3 |
| | * | Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly | Kevin Serrano | 2016-11-10 | 3 | -17/+12 |
| |/| | |||||
| | * | Unify warning functions. | Kevin G. Serrano | 2016-11-08 | 3 | -17/+12 |
| * | | Merge pull request #797 from MetaMask/Version-2.13.7 | Frankie | 2016-11-09 | 3 | -2/+4 |
| |\ \ | |||||
| | * | | Hard coding jazzicon at working version2.13.7 | Dan Finlay | 2016-11-09 | 1 | -1/+1 |
| | * | | Version 2.13.7 | Dan Finlay | 2016-11-09 | 2 | -1/+3 |
| |/ / | |||||
| * | | Merge pull request #796 from MetaMask/IncreaseGasBuffer | Dan Finlay | 2016-11-09 | 3 | -8/+8 |
| |\ \ | |||||
| | * | | Adjust gas buffer to be 20% over estimate | Dan Finlay | 2016-11-09 | 3 | -7/+7 |
| | * | | Increase gas buffer | Dan Finlay | 2016-11-09 | 3 | -4/+4 |
| |/ / | |||||
* | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 4 | -17/+48 |
|\| | | |||||
| * | | Merge pull request #793 from MetaMask/i787-HighGasBug | Kevin Serrano | 2016-11-08 | 3 | -16/+45 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix gas price buffering | Dan Finlay | 2016-11-08 | 3 | -13/+12 |
| | * | Added failing test for #787 | Dan Finlay | 2016-11-08 | 1 | -11/+41 |
| |/ | |||||
| * | Merge pull request #786 from MetaMask/i763-GithubLink | kumavis | 2016-11-01 | 2 | -1/+3 |
| |\ | |||||
| | * | Fix github link on info page | Dan Finlay | 2016-11-01 | 2 | -1/+3 |
| |/ | |||||
* | | Fix integration test suite | Dan Finlay | 2016-11-08 | 3 | -13/+5 |
* | | Fix nickname test | Dan Finlay | 2016-11-08 | 1 | -0/+1 |
* | | Fix BN reference | Dan Finlay | 2016-11-08 | 1 | -0/+1 |
* | | Fix 787 gas buffer bug | Dan Finlay | 2016-11-08 | 2 | -9/+25 |
* | | Fix network checking | Dan Finlay | 2016-11-05 | 1 | -21/+1 |
* | | 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 |
* | | 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 |
* | | 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 |
* | | 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 |
* | | 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 |
* | | Implement auto-fauceting | Kevin Serrano | 2016-11-01 | 1 | -1/+6 |
* | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i3... | Kevin Serrano | 2016-10-31 | 5 | -16/+142 |
|\ \ | |||||
| * | | 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 displ... | Kevin Serrano | 2016-10-31 | 2 | -2/+3 |
* | | | 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 i3... | Kevin Serrano | 2016-10-29 | 13 | -30/+465 |
|\| | | |||||
| * | | 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 i3... | Dan Finlay | 2016-10-26 | 20 | -205/+7 |
| |\ \ | |||||
| * \ \ | 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 - 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 |
| |\ \ \ | |||||
| | * \ \ | 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 |
| |\ \ \ \ | |||||
| | * \ \ \ | 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 | Dan Finlay | 2016-10-27 | 2 | -1/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #768 from MetaMask/i762-RenameWalletToAccount | Dan Finlay | 2016-10-27 | 2 | -1/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | 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 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | 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 |
| | |/ / / | |||||
| | | * | | 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 | 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 | Dan Finlay | 2016-10-26 | 2 | -1/+2 |
| |/ / | |||||
| * | | Merge pull request #745 from MetaMask/i743-FixDelegateCallFlag | kumavis | 2016-10-25 | 4 | -14/+35 |
| |\ \ | |||||
| | * | | 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 |
* | | | | | 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 i3... | Kevin Serrano | 2016-10-24 | 15 | -87/+712 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | 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 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | 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 | 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 i3... | Dan Finlay | 2016-10-21 | 27 | -120/+483 |
|\ \ \ | |||||
| * \ \ | 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 |
| | |\ \ \ | |||||
| | | * | | | 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. | Dan Finlay | 2016-10-19 | 2 | -1/+3 |
| | |/ / | |||||
| | * | | Merge pull request #744 from MetaMask/i738-IncreaseGas | kumavis | 2016-10-18 | 3 | -1/+29 |
| | |\ \ | |||||
| | | * | | 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 |
| | |/ / | |||||
| | * | | Merge pull request #737 from MetaMask/Version-2.13.4 | Kevin Serrano | 2016-10-18 | 3 | -2/+5 |
| | |\ \ | |||||
| | | * | | 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 |
| | |\ \ | |||||
| | | * \ | 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 |
| | |\ \ \ | |||||
| | | * | | | 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 or... | Kevin Serrano | 2016-10-13 | 11 | -144/+467 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merge pull request #730 from MetaMask/i695-dapp-reload | kumavis | 2016-10-13 | 7 | -35/+57 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | 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 |
| |_|/ / |/| | | | |||||
* | | | | 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 |
* | | | | 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 |
| |\ \ \ | |||||
| | * \ \ | 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 |
| |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | * | | | 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 |
| | * | | | 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 |
| | |/ / / |