Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add close window support to signature requests. Move logic to actions | Alexander Tseung | 2018-07-24 | 2 | -21/+10 |
| | |||||
* | UI confirm screen closes confirmation window on submit or cancel of a tx | Dan Miller | 2018-07-24 | 1 | -4/+15 |
| | |||||
* | show alert ONLY when device is connected | brunobar79 | 2018-07-23 | 1 | -4/+11 |
| | |||||
* | Add fallback options for displaying recipient name in the Confirm screen | Alexander Tseung | 2018-07-21 | 1 | -1/+13 |
| | |||||
* | Merge pull request #4625 from MetaMask/initial-trezor-support | Bruno Barbieri | 2018-07-20 | 5 | -1/+552 |
|\ | | | | | Initial trezor support | ||||
| * | last css fixes | brunobar79 | 2018-07-19 | 2 | -4/+23 |
| | | |||||
| * | fix support link | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | |||||
| * | fix unsupported browser view | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | |||||
| * | lint | brunobar79 | 2018-07-19 | 1 | -1/+1 |
| | | |||||
| * | scroll smooth | brunobar79 | 2018-07-19 | 1 | -3/+11 |
| | | |||||
| * | design done | brunobar79 | 2018-07-19 | 1 | -23/+86 |
| | | |||||
| * | fix browser not supported screen | brunobar79 | 2018-07-18 | 1 | -1/+1 |
| | | |||||
| * | updated account list based on new designs | brunobar79 | 2018-07-18 | 3 | -14/+28 |
| | | |||||
| * | Merge branch 'develop' into initial-trezor-support | brunobar79 | 2018-07-17 | 2 | -3/+3 |
| |\ | |||||
| * \ | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | fix account selection | brunobar79 | 2018-07-14 | 1 | -2/+6 |
| | | | | |||||
| * | | | added affiliate link to trezor | brunobar79 | 2018-07-14 | 1 | -0/+6 |
| | | | | |||||
| * | | | detect ability to open popup instead of browser | brunobar79 | 2018-07-13 | 2 | -6/+13 |
| | | | | |||||
| * | | | fix account balance bug | brunobar79 | 2018-07-13 | 1 | -9/+15 |
| | | | | |||||
| * | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-13 | 27 | -130/+1170 |
| |\ \ \ | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | forget device and autiload account features added | brunobar79 | 2018-07-12 | 2 | -1/+40 |
| | | | | | |||||
| * | | | | fix account duplication | brunobar79 | 2018-07-10 | 1 | -6/+0 |
| | | | | | |||||
| * | | | | fix all the account related bugs | brunobar79 | 2018-07-10 | 2 | -13/+27 |
| | | | | | |||||
| * | | | | copy updated | brunobar79 | 2018-07-07 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | update connect harwdware screen | brunobar79 | 2018-07-07 | 1 | -8/+20 |
| | | | | | |||||
| * | | | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | brunobar79 | 2018-07-07 | 1 | -151/+162 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | initial-trezor-support | ||||
| * | | | | | UI refactor | brunobar79 | 2018-07-06 | 3 | -97/+106 |
| | | | | | | |||||
| * | | | | | Refactor UI | brunobar79 | 2018-07-06 | 4 | -266/+328 |
| | | | | | | |||||
| * | | | | | move strings to localization file | brunobar79 | 2018-07-06 | 1 | -11/+12 |
| | | | | | | |||||
| * | | | | | added message for non-chrome browsers | brunobar79 | 2018-07-06 | 1 | -1/+26 |
| | | | | | | |||||
| * | | | | | lint fix | brunobar79 | 2018-07-04 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | fix merge conflicts | brunobar79 | 2018-07-04 | 2 | -2/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | fix merge conflicts | brunobar79 | 2018-07-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | move hardcoded strings to localization file | brunobar79 | 2018-07-03 | 1 | -17/+7 |
| | | | | | | | | |||||
| * | | | | | | | fix merge conflicts | brunobar79 | 2018-07-02 | 2 | -10/+10 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | move TrezorKeyring to its own package | Bruno | 2018-06-13 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | balances working | Bruno | 2018-06-11 | 1 | -2/+18 |
| | | | | | | | | | |||||
| * | | | | | | | | initial trezor support | Bruno | 2018-06-10 | 3 | -1/+260 |
| | | | | | | | | | |||||
* | | | | | | | | | Use Number constructor for number conversion. Use existing ↵ | Alexander Tseung | 2018-07-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | noConversionRateAvailable message | ||||
* | | | | | | | | | Fix tests | Alexander Tseung | 2018-07-18 | 2 | -1/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Add fallback when no function found, fix network colors, add fiat values for ↵ | Alexander Tseung | 2018-07-18 | 11 | -92/+183 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tokens with contract exchange rates | ||||
* | | | | | | | | | Remove unused confirm transaction files | Alexander Tseung | 2018-07-18 | 2 | -21/+0 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Fix send import paths in confirm tx components | Whymarrh Whitby | 2018-07-16 | 2 | -3/+3 |
| |_|_|_|_|_|/ |/| | | | | | | |||||
* | | | | | | | Merge pull request #4766 from whymarrh/null-translations | Whymarrh Whitby | 2018-07-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Rework i18n-helper getMessage function | ||||
| * | | | | | | Remove unneeded MetaMaskConnect connect wrapper | Whymarrh Whitby | 2018-07-12 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #4691 from MetaMask/i4404-confirm-refactor | Alexander Tseung | 2018-07-12 | 26 | -94/+1134 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Refactor and redesign confirm transaction views | ||||
| * | | | | | | Fix font sizes, colors. Include data tab for send-eth transaction ↵ | Alexander Tseung | 2018-07-12 | 2 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | confirmations that have data | ||||
| * | | | | | | Various fixes from PR comments | Alexander Tseung | 2018-07-07 | 6 | -119/+162 |
| | | | | | | | |||||
| * | | | | | | Use eth-method-registry to get method data | Alexander Tseung | 2018-07-07 | 5 | -22/+36 |
| | | | | | | | |||||
| * | | | | | | Display newest transaction | Alexander Tseung | 2018-07-07 | 1 | -2/+3 |
| | | | | | | | |||||
| * | | | | | | Refactor data flow, signature request routing | Alexander Tseung | 2018-07-07 | 6 | -79/+145 |
| | | | | | | | |||||
| * | | | | | | Refactor and redesign confirm transaction views | Alexander Tseung | 2018-07-07 | 26 | -94/+994 |
| | |_|_|_|/ | |/| | | | | |||||
* / | | | | | Prevent users from submitting password multiple times on the unlock screen | Alexander Tseung | 2018-07-11 | 1 | -36/+36 |
|/ / / / / | |||||
* | | | | | Merge pull request #4648 from MetaMask/update-import-from-seed-screen | Dan J Miller | 2018-07-06 | 1 | -151/+162 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Update import from seed screen on new ui. | ||||
| * | | | | Delete old restore vault file. | Dan | 2018-07-06 | 2 | -340/+162 |
| | | | | | |||||
| * | | | | Update import from seed screen on new ui. | Dan | 2018-07-05 | 1 | -0/+189 |
| | | | | | |||||
* | | | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessages | Dan J Miller | 2018-07-04 | 2 | -0/+2 |
|\ \ \ \ \ | |/ / / / |/| | | | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful | ||||
| * | | | | fixes 4663 | Sara Reynolds | 2018-07-04 | 2 | -0/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #4633 from MetaMask/i4580-import-account-errors | Alexander Tseung | 2018-07-04 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Show all errors on account creation screen. | ||||
| * | | | Check that error is defined in import-account error catch. | Dan | 2018-06-29 | 2 | -2/+2 |
| | | | | |||||
| * | | | Show all errors on account creation screen. | Dan | 2018-06-29 | 2 | -2/+2 |
| | |/ | |/| | |||||
* / | | eslint --fix . | brunobar79 | 2018-07-03 | 1 | -1/+1 |
|/ / | |||||
* / | notices - replace getLatestNotice with getNextNotice | kumavis | 2018-06-14 | 2 | -10/+10 |
|/ | |||||
* | Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui | kumavis | 2018-06-07 | 2 | -13/+36 |
|\ | | | | | Handle errors for null selected address after Importing account (json or private key) | ||||
| * | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 9 | -16/+16 |
| |\ | |||||
| * | | Fix then-catch + error handling in import-account | Dan | 2018-05-31 | 2 | -4/+2 |
| | | | |||||
| * | | Importing account by json and private key shows error and does not change ↵ | Dan | 2018-05-31 | 2 | -10/+35 |
| | | | | | | | | | | | | account if no selectedAddress comes after import. | ||||
* | | | i18n - ja improvements | 03-26 | 2018-06-07 | 4 | -9/+23 |
| |/ |/| | |||||
* | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 2 | -2/+2 |
| | | |||||
* | | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵ | Alexander Tseung | 2018-06-01 | 7 | -16/+16 |
|/ | | | | style buttons | ||||
* | Fix error handling on incorrect password (#4401) | Alexander Tseung | 2018-05-31 | 1 | -11/+9 |
| | |||||
* | Fix add-token token list placeholder width (#4365) | Alexander Tseung | 2018-05-30 | 1 | -0/+4 |
| | |||||
* | newui - unlock - dont catch errors unrelated to tryUnlockMetamask | kumavis | 2018-05-29 | 1 | -2/+2 |
| | |||||
* | Merge pull request #4308 from MetaMask/i4232-addtoken | kumavis | 2018-05-23 | 25 | -432/+933 |
|\ | | | | | Update designs for Add Token screen | ||||
| * | Fix tests | Alexander Tseung | 2018-05-21 | 1 | -11/+6 |
| | | |||||
| * | Update designs for Add Token screen | Alexander Tseung | 2018-05-20 | 25 | -432/+938 |
| | | |||||
* | | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 2 | -2/+2 |
|/ | |||||
* | ui - unlock - remove setNetworkEndpoints calls from new unlock screen | kumavis | 2018-05-17 | 2 | -3/+0 |
| | |||||
* | ui - remove files accidently added by bad merge | kumavis | 2018-05-17 | 1 | -189/+0 |
| | |||||
* | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵ | kumavis | 2018-05-17 | 4 | -0/+267 |
|\ | | | | | | | network-controller-remove-setNetworkEndpoints | ||||
| * | Add TextField component to storybook | Alexander Tseung | 2018-05-12 | 2 | -2/+1 |
| | | |||||
| * | Add new unlock screen design | Alexander Tseung | 2018-05-12 | 5 | -194/+268 |
| | | |||||
* | | lint - cleanup some unused variables | kumavis | 2018-05-03 | 2 | -2/+0 |
| | | |||||
* | | network - remove setNetworkEndpoints | kumavis | 2018-05-01 | 2 | -5/+0 |
|/ | |||||
* | Handle Promise rejections when importing accounts (#4142) | Paul Bouchon | 2018-05-01 | 2 | -0/+4 |
| | | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement | ||||
* | Merge pull request #4059 from MetaMask/i-4033-seed-words | kumavis | 2018-05-01 | 2 | -147/+116 |
|\ | | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow. | ||||
| * | Redirect to correct seed phrase screen | Alexander Tseung | 2018-04-27 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-23 | 1 | -1/+9 |
| |\ | | | | | | | | | | i-4033-seed-words | ||||
| * | | Use new design for reveal seed screen. Persist seed words only in first time ↵ | Alexander Tseung | 2018-04-23 | 1 | -145/+114 |
| | | | | | | | | | | | | flow | ||||
* | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵ | Dan | 2018-04-28 | 1 | -1/+1 |
| | | | | | | | | | | | | or decimals. | ||||
* | | | Clean up network config | Alexander Tseung | 2018-04-24 | 2 | -2/+2 |
| |/ |/| | |||||
* | | Show correct MetaMask version number in the Info page | Alexander Tseung | 2018-04-19 | 1 | -1/+9 |
|/ | |||||
* | Fix confirmation popup not always opening | Alexander Tseung | 2018-04-17 | 1 | -2/+3 |
| | |||||
* | Require loglevel singleton in each module that uses it | bitpshr | 2018-04-14 | 2 | -0/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| | | | | cb-254 | ||||
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -0/+1 |
| | | | | cb-254 | ||||
* | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-04 | 1 | -9/+12 |
| | | | | cb-254 | ||||
* | Fix transaction confirmations | Alexander Tseung | 2018-04-04 | 1 | -14/+16 |
| | |||||
* | Fix merge conflicts. Modify send workflow | Alexander Tseung | 2018-04-03 | 1 | -15/+14 |
| | |||||
* | Fix lint errors | Alexander Tseung | 2018-04-03 | 3 | -4/+0 |
| | |||||
* | Refactor onboarding flow | Alexander Tseung | 2018-04-02 | 4 | -15/+15 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 8 | -94/+135 |
| | |||||
* | Fix merge conflicts. Refactor renderPrimary into Home component | Alexander Tseung | 2018-03-31 | 5 | -358/+434 |
| | |||||
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 8 | -115/+153 |
| | |||||
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 9 | -17/+36 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 8 | -286/+360 |
| | |||||
* | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 2 | -4/+15 |
| | | | | into cb-254 | ||||
* | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 4 | -14/+20 |
| | |||||
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 11 | -112/+284 |
| | |||||
* | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 | Alexander Tseung | 2018-01-30 | 5 | -65/+85 |
| | |||||
* | Add route for signature request | Alexander Tseung | 2017-12-15 | 1 | -0/+321 |
| | |||||
* | Add initialized checks for first time flow routes | Alexander Tseung | 2017-12-15 | 4 | -71/+48 |
| | |||||
* | Add routes for mascara | Alexander Tseung | 2017-12-15 | 5 | -25/+78 |
| | |||||
* | Add react-router to allow use of the browser back button | Alexander Tseung | 2017-12-15 | 13 | -0/+1897 |