Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixes 4663 | Sara Reynolds | 2018-07-04 | 2 | -0/+2 |
| | |||||
* | eslint --fix . | brunobar79 | 2018-07-03 | 1 | -1/+1 |
| | |||||
* | 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 | 4 | -6/+6 |
| |\ | |||||
| * | | 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 | 1 | -3/+12 |
| |/ |/| | |||||
* | | update helpscout links to zenhub | Bobby Dresser | 2018-06-01 | 1 | -1/+1 |
| | | |||||
* | | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵ | Alexander Tseung | 2018-06-01 | 3 | -7/+7 |
|/ | | | | style buttons | ||||
* | Move setAccountLabel into PreferencesController | Whymarrh Whitby | 2018-05-17 | 2 | -2/+2 |
| | |||||
* | 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 branch 'master' of https://github.com/MetaMask/metamask-extension into ↵ | Alexander Tseung | 2018-04-06 | 1 | -1/+2 |
| | | | | cb-254 | ||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-31 | 5 | -30/+57 |
| | |||||
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 5 | -47/+39 |
| | |||||
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 5 | -5/+5 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 5 | -102/+145 |
| | |||||
* | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵ | Alexander Tseung | 2018-02-09 | 1 | -0/+6 |
| | | | | into cb-254 | ||||
* | Fix merge conflicts from uat-next | Alexander Tseung | 2018-02-01 | 3 | -13/+20 |
| | |||||
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 6 | -0/+475 |