aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/create-account
Commit message (Collapse)AuthorAgeFilesLines
* Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-172-2/+2
|
* Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-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 Tseung2018-04-061-1/+2
| | | | cb-254
* Fix merge conflictsAlexander Tseung2018-03-315-30/+57
|
* Fix i18n merge conflictsAlexander Tseung2018-03-305-47/+39
|
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-295-5/+5
|
* Fix merge conflictsAlexander Tseung2018-03-275-102/+145
|
* Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-091-0/+6
| | | | into cb-254
* Fix merge conflicts from uat-nextAlexander Tseung2018-02-013-13/+20
|
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-016-0/+475