| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge pull request #5810 from whymarrh/bump-nvmrc | Whymarrh Whitby | 2018-11-22 | 2 | -9/+10 |
| |\ |
|
| | * | Update local build instructions | Whymarrh Whitby | 2018-11-22 | 1 | -8/+9 |
| | * | nvm: Bump Node version to 8.13 | Whymarrh Whitby | 2018-11-22 | 1 | -1/+1 |
| * | | Merge pull request #5797 from MetaMask/trezor-v6 | Bruno Barbieri | 2018-11-22 | 12 | -45/+167 |
| |\ \
| |/
|/| |
|
| | * | bump eth-trezor-keyring | brunobar79 | 2018-11-22 | 2 | -7288/+7352 |
| | * | update package-lock | brunobar79 | 2018-11-21 | 1 | -7313/+7277 |
| | * | trezor v6 | brunobar79 | 2018-11-21 | 3 | -7419/+7441 |
| | * | fix merge conflicts | brunobar79 | 2018-11-21 | 72 | -8609/+8076 |
| | |\ |
|
| | * | | clean up | brunobar79 | 2018-11-15 | 2 | -3/+2 |
| | * | | Merge branch 'trezor-v5' of github.com:MetaMask/metamask-extension into trezo... | brunobar79 | 2018-11-15 | 2 | -8/+19 |
| | |\ \ |
|
| | | * | | test | brunobar79 | 2018-11-15 | 1 | -4/+0 |
| | | * | | test | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | | * | | test | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | | * | | try with custom box | brunobar79 | 2018-11-15 | 1 | -1/+1 |
| | | * | | package-lock.json | brunobar79 | 2018-11-15 | 1 | -20/+41 |
| | * | | | update package-lock.json | brunobar79 | 2018-11-15 | 1 | -17/+27 |
| | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 7 | -10/+45 |
| | |\ \ \
| | |/ /
| |/| | |
|
| | * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-11-15 | 3 | -1/+40 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'develop' into trezor-v5 | brunobar79 | 2018-11-14 | 46 | -479/+4603 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | fix merge conflicts | brunobar79 | 2018-11-07 | 191 | -3748/+6145 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-10-21 | 104 | -8896/+12489 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | fix conflicts | brunobar79 | 2018-10-17 | 298 | -12054/+28334 |
| | |\ \ \ \ \ \ \ |
|
| | * | | | | | | | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -95/+167 |
| | * | | | | | | | | fix merge conflicts | brunobar79 | 2018-09-11 | 4 | -4/+8 |
| | |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | update package-lock.json | brunobar79 | 2018-09-11 | 1 | -49/+126 |
| | * | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-09-06 | 173 | -2562/+4615 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | add port names blacklist | brunobar79 | 2018-08-23 | 1 | -0/+8 |
| | * | | | | | | | | | | handle onDisconnect | brunobar79 | 2018-08-23 | 1 | -0/+4 |
| | * | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-23 | 11 | -5776/+1605 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | update package-lock | brunobar79 | 2018-08-22 | 1 | -6/+14 |
| | * | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-08-22 | 4 | -18/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | fix comment | brunobar79 | 2018-08-21 | 1 | -2/+0 |
| | * | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-21 | 116 | -4856/+8379 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | update package-lock | brunobar79 | 2018-08-21 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | fix e2e tests | brunobar79 | 2018-08-11 | 1 | -30/+1 |
| | * | | | | | | | | | | | | | undo permission change | brunobar79 | 2018-08-11 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | add error messages | brunobar79 | 2018-08-11 | 1 | -2/+4 |
| | * | | | | | | | | | | | | | hide export private key for trezor accounts | brunobar79 | 2018-08-10 | 2 | -32/+46 |
| | * | | | | | | | | | | | | | fixes | brunobar79 | 2018-08-10 | 4 | -6779/+49 |
| | * | | | | | | | | | | | | | add app/vendor dir to eslintignore | brunobar79 | 2018-08-10 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | use new connect.js file | brunobar79 | 2018-08-10 | 2 | -9479/+1245 |
| | * | | | | | | | | | | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 | brunobar79 | 2018-08-10 | 18 | -29/+194 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | update package-lock.json | brunobar79 | 2018-08-09 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | fix merge conflicts | brunobar79 | 2018-08-09 | 21 | -32534/+32471 |
| | * | | | | | | | | | | | | | | | clean up | brunobar79 | 2018-08-05 | 3 | -3/+3 |
| | * | | | | | | | | | | | | | | | trezor v5 working on firefox | brunobar79 | 2018-08-05 | 7 | -2/+15084 |
| * | | | | | | | | | | | | | | | | Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799) | Whymarrh Whitby | 2018-11-22 | 1 | -16/+29 |
| * | | | | | | | | | | | | | | | | Show byte count for hex data on confirm screen (#5798) | Whymarrh Whitby | 2018-11-22 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | Merge pull request #5334 from whymarrh/ui-switch | Whymarrh Whitby | 2018-11-22 | 41 | -795/+166 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Remove first-time and navigate-txs integration tests | Whymarrh Whitby | 2018-11-21 | 5 | -340/+1 |
| | * | | | | | | | | | | | | | | | | Speed up genStates script by using built-in require fn | Whymarrh Whitby | 2018-11-21 | 1 | -4/+3 |
| | * | | | | | | | | | | | | | | | | ci: Drop old UI e2e tests from CircleCI | Whymarrh Whitby | 2018-11-21 | 1 | -41/+0 |
| | * | | | | | | | | | | | | | | | | Remove Mascara from CircleCI config | Whymarrh Whitby | 2018-11-21 | 1 | -13/+0 |
| | * | | | | | | | | | | | | | | | | Remove "Beta" from welcome messages | Whymarrh Whitby | 2018-11-21 | 21 | -34/+34 |
| | * | | | | | | | | | | | | | | | | Don't announce new UI to users switching back | Whymarrh Whitby | 2018-11-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | | | | | Update new UI links in the old UI s/Beta/New/ | Whymarrh Whitby | 2018-11-21 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | | Remove "Beta" from header logo | Whymarrh Whitby | 2018-11-21 | 3 | -116/+63 |
| | * | | | | | | | | | | | | | | | | Add timeout to waitUntilXWindowHandles e2e helper fn | Whymarrh Whitby | 2018-11-21 | 1 | -5/+16 |
| | * | | | | | | | | | | | | | | | | Update new UI e2e tests for new UI default | Whymarrh Whitby | 2018-11-21 | 4 | -209/+21 |
| | * | | | | | | | | | | | | | | | | Default to the new UI for first time users | Whymarrh Whitby | 2018-11-21 | 4 | -32/+26 |
| * | | | | | | | | | | | | | | | | | Merge pull request #5791 from MetaMask/fix-ledger-stuff | Bruno Barbieri | 2018-11-21 | 2 | -208/+208 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | update package-lock.json | brunobar79 | 2018-11-21 | 2 | -208/+208 |
| |/ / / / / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / / / / | Version 5.0.3 (#5785) | Dan Finlay | 2018-11-21 | 6 | -277/+270 |
| |/ / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | Fix button styling for Create Account Connect (#5787) | Alexander Tseung | 2018-11-20 | 3 | -47/+13 |
| * | | | | | | | | | | | | | | | Fix rounding issue when sending max tokens (#5695) | Alexander Tseung | 2018-11-20 | 37 | -104/+138 |
| * | | | | | | | | | | | | | | | 1102: Push publicConfigStore to next turn to avoid race conditiono (#5777) | Paul Bouchon | 2018-11-18 | 1 | -2/+6 |
| * | | | | | | | | | | | | | | | Auto fail transactions that have been approved for over 12 hours (#5765) | Dan Finlay | 2018-11-17 | 4 | -0/+107 |
| * | | | | | | | | | | | | | | | ESLint fixes (#5775) | Whymarrh Whitby | 2018-11-17 | 15 | -37/+37 |
| * | | | | | | | | | | | | | | | Tx controller now uses safe event emitter (#5769) | Frankie | 2018-11-17 |
