Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'develop' into handle-import-account-failure-in-ui | Dan | 2018-06-03 | 3 | -4/+4 |
|\ | |||||
| * | 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 | 2 | -5/+5 |
| | | | | | | | | style buttons | ||||
* | | 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. | ||||
* | 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 | 4 | -24/+46 |
| | |||||
* | Fix i18n merge conflicts | Alexander Tseung | 2018-03-30 | 4 | -41/+33 |
| | |||||
* | Fix merge conflicts. Refactor onboarding flow. | Alexander Tseung | 2018-03-29 | 4 | -4/+4 |
| | |||||
* | Fix merge conflicts | Alexander Tseung | 2018-03-27 | 4 | -96/+138 |
| | |||||
* | 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 | 2 | -8/+13 |
| | |||||
* | Add create new account routes, fix conflicts from uat updates | Alexander Tseung | 2018-02-01 | 4 | -0/+299 |