aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/create-account
Commit message (Expand)AuthorAgeFilesLines
* fix merge conflictsbrunobar792018-07-041-1/+1
|\
| * eslint --fix .brunobar792018-07-031-1/+1
* | move hardcoded strings to localization filebrunobar792018-07-031-17/+7
* | move TrezorKeyring to its own packageBruno2018-06-131-3/+3
* | balances workingBruno2018-06-111-2/+18
* | initial trezor supportBruno2018-06-103-1/+260
|/
* Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-072-13/+36
|\
| * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-034-6/+6
| |\
| * | Fix then-catch + error handling in import-accountDan2018-05-312-4/+2
| * | Importing account by json and private key shows error and does not change acc...Dan2018-05-312-10/+35
* | | i18n - ja improvements03-262018-06-071-3/+12
| |/ |/|
* | update helpscout links to zenhubBobby Dresser2018-06-011-1/+1
* | Change btn-secondary styles to btn-default. Make btn-secondary red warning st...Alexander Tseung2018-06-013-7/+7
|/
* Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-172-2/+2
* Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-0/+4
* Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ...Alexander Tseung2018-04-061-1/+2
* 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 int...Alexander Tseung2018-02-091-0/+6
* 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