| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' into i831-AddRopsten-Dev | Dan Finlay | 2016-11-22 | 100 | -814/+8243 |
| |\ | |||||
| | * | Merge pull request #827 from MetaMask/currency-cleanup | Dan Finlay | 2016-11-19 | 4 | -7/+5731 |
| | |\ | | | | | | | Convert conversion-util to pure json. | ||||
| | | * | Convert conversion util to pure json. | Kevin Serrano | 2016-11-19 | 4 | -7/+5731 |
| | | | | |||||
| | * | | Merge pull request #826 from MetaMask/mini-lint | Dan Finlay | 2016-11-19 | 2 | -3/+3 |
| | |\ \ | | |/ | |/| | Maintain linting. | ||||
| | | * | Maintain linting. | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| | |/ | |||||
| | * | Merge pull request #824 from MetaMask/failing-tests | Dan Finlay | 2016-11-19 | 3 | -5/+72 |
| | |\ | | | | | | | Promisify persistence of old vaults in migration code | ||||
| | | * | Promisify persistence of keyrings before returning key | Kevin Serrano | 2016-11-19 | 1 | -5/+5 |
| | | | | | | | | | | | | | Change single letter variables (shame) | ||||
| | | * | Merge branch 'dev' into failing-tests | Kevin Serrano | 2016-11-19 | 2 | -3/+3 |
| | | |\ | | |/ | |/| | |||||
| | * | | Merge pull request #823 from MetaMask/FixBork | Kevin Serrano | 2016-11-19 | 1 | -2/+2 |
| | |\ \ | | | | | | | | | Update migration code for new hd wallet param name | ||||
| | | * | | Update migration code for new hd wallet param name | Dan Finlay | 2016-11-19 | 1 | -2/+2 |
| | |/ / | |||||
| | * | | Persist keyrings from migration to storage. | Kevin Serrano | 2016-11-19 | 1 | -1/+1 |
| | | | | |||||
| | | * | Create failing test to check submitPassword in keyringController. | Kevin Serrano | 2016-11-19 | 2 | -0/+67 |
| | |/ | |||||
| | * | Resolve merge conflict. | Kevin Serrano | 2016-11-19 | 94 | -805/+2444 |
| | |\ | |||||
| | | * | random-id - use Number.MAX_SAFE_INTEGER as max | kumavis | 2016-11-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | Merge pull request #816 from MetaMask/i328-MultiVault | kumavis | 2016-11-18 | 95 | -818/+2457 |
| | | |\ | | | | | | | | | Multi vault to Dev Branch | ||||
| | | | * | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2016-11-18 | 66 | -306/+273 |
| | | | |\ | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | | | * | 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 ↵ | Kevin Serrano | 2016-11-16 | 0 | -0/+0 |
| | | | | |\ | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | | | | * | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 3 | -5/+5 |
| | | | | | |\ | |||||
| | | | | * | \ | Resolve merge conflicts. | Kevin Serrano | 2016-11-16 | 3 | -5/+5 |
| | | | | |\ \ \ | | | | | |/ / | | | | |/| / | | | | | |/ | |||||
| | | | | * | | Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into ↵ | Kevin Serrano | 2016-11-16 | 1 | -0/+2 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | i328-MultiVault | ||||
| | | | | | * | | 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 ↵ | Kevin Serrano | 2016-11-12 | 3 | -203/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | tests. | ||||
| | | | | * | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Rearrange the require statements. - Remove unused web3. - Simplify some callbacks and promises. - Clarify certain parameters. | ||||
| | | | | * | | Clarify functions names. Package normalize inside util file. Fix require ↵ | Kevin Serrano | 2016-11-12 | 1 | -11/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | headers. | ||||
| | | | | * | | 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 branch 'master' into i328-MultiVault | kumavis | 2016-11-11 | 3 | -2/+26 |
| | | | | |\ \ | |||||
| | | | | * \ \ | Merge pull request #802 from MetaMask/confTxFix | Kevin Serrano | 2016-11-11 | 9 | -28/+33 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | Conf tx fix | ||||
| | | | | | * | | | 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 |
| | | | | |/| | | | |||||
| | | | * | | | | | Replace old random-id code with incrementing id generator | Dan Finlay | 2016-11-18 | 3 | -11/+12 |
| | | | |/ / / / | |||||
| | | | * | | | | Merge branch 'master' into i328-MultiVault | Dan Finlay | 2016-11-08 | 4 | -17/+48 |
| | | | |\ \ \ \ | |||||
| | | | * | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | | 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 branch 'master' into i328-MultiVault | Kevin Serrano | 2016-10-21 | 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 |
| | | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | 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 | ||||
| | | | * | | | | | | | | | | | | | 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 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | 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 |
| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Begin adding Ropsten support | Dan Finlay | 2016-11-22 | 8 | -4/+42 |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ropsten links will still not work until Etherscan publishes their ropsten link format. At that time we will need to update ui/lib/account-link.js Otherwise, fixes #831 | ||||
| * | | | | | | | | | | | | | | Merge pull request #819 from MetaMask/i791-FixLosingConnection | kumavis | 2016-11-18 | 4 | -11/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increment tx ids to avoid collisions | ||||
| | * | | | | | | | | | | | | | | Increment tx ids to avoid collisions | Dan Finlay | 2016-11-18 | 4 | -11/+13 |
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 It was possible for two requests to have the same ID, causing a crash and loss of StreamProvider connection. This new id generation strategy creates a random ID, and increments it for each request. In case the id generator is included from two different processes, I'm initializing the counter at a random number, and rolling it over a large number when it gets too big. | ||||
| * | | | | | | | | | | | | | | Merge pull request #814 from MetaMask/Version-2.13.8 | kumavis | 2016-11-17 | 2 | -2/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | Version 2.13.8: Faithful Serpent | ||||
| | * | | | | | | | | | | | | | Version 2.13.82.13.8 | Dan Finlay | 2016-11-17 | 2 | -2/+5 |
| |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge pull request #811 from MetaMask/deadly-fix | kumavis | 2016-11-15 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | Fix error display in confirmation screen | ||||
| | * | | | | | | | | | | | | 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 pull request #807 from MetaMask/cssIsAwesome | kumavis | 2016-11-11 | 2 | -2/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | Fix funny looking errors in conf-tx | ||||
| | * | | | | | | | | | | | lint fix | Frankie | 2016-11-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Fix funny looking errors in conf-tx | Frankie | 2016-11-11 | 2 | -2/+5 |
| |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge pull request #805 from MetaMask/i804 | kumavis | 2016-11-11 | 3 | -2/+26 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | detect tx error - show warning and fix gasLimit | ||||
| | * | | | | | | | | | | 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 #801 from MetaMask/deadly | Kevin Serrano | 2016-11-10 | 6 | -18/+14 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Properly implement 20% gas bump | ||||
| | * | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Version 2.13.7 | ||||
| | * | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | Increase gas buffer | ||||
| | * | | | | | | | | | | 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 |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #795 | ||||
| * | | | | | | | | | | Merge pull request #793 from MetaMask/i787-HighGasBug | Kevin Serrano | 2016-11-08 | 3 | -16/+45 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | i787 High gas bug | ||||
| | * | | | | | | | | | Fix gas price buffering | Dan Finlay | 2016-11-08 | 3 | -13/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time. | ||||
| | * | | | | | | | | | 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 | ||||
| | * | | | | | | | | Fix github link on info page | Dan Finlay | 2016-11-01 | 2 | -1/+3 |
| |/ / / / / / / / | |||||
| * | | | | | | | | 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 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 |
| | | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | | 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 |
| |/ / / / / / / | |||||
| | * / / / / / | 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 i743-FixDelegateCallFlag | Kevin Serrano | 2016-10-19 | 4 | -3/+7 |
| | | |\ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | | 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. | ||||
| | * / / / | 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 | ||||
| * | | | | 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 |
| | |_|_|/ |/| | | | |||||
| * | | | | 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 |
| | |\ \ \ | |/ / / |/| | | | |||||
 |
index : tangerine-wallet-browser | |
| Tangerine fork of MetaMask browser extension (https://github.com/tangerine-network/tangerine-wallet-browser) | LAN-TW |
| aboutsummaryrefslogtreecommitdiffstats |