aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/pages/create-account/import-account/json.js
Commit message (Expand)AuthorAgeFilesLines
* Folder restructure (#6304)Chi Kei Chan2019-03-221-170/+0
* Metametrics (#6171)Dan J Miller2019-03-051-0/+15
* Remove password check when importing Account JSONChi Kei Chan2019-02-191-5/+0
* Save recent network balances in local storage (#5843)Dan J Miller2018-12-011-1/+2
* Bug Fix: #5183 history not definedSean Rabaut2018-09-141-1/+1
* Add raised type buttons to Button component. Refactor all buttons within app ...Alexander Tseung2018-09-131-8/+11
* Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-041-0/+1
|\
| * fixes 4663Sara Reynolds2018-07-041-0/+1
* | Check that error is defined in import-account error catch.Dan2018-06-291-1/+1
* | Show all errors on account creation screen.Dan2018-06-291-1/+1
|/
* Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-031-1/+1
|\
| * Change btn-secondary styles to btn-default. Make btn-secondary red warning st...Alexander Tseung2018-06-011-2/+2
* | Fix then-catch + error handling in import-accountDan2018-05-311-2/+1
* | Importing account by json and private key shows error and does not change acc...Dan2018-05-311-5/+18
|/
* Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-011-0/+2
* Fix merge conflictsAlexander Tseung2018-03-311-9/+13
* Fix i18n merge conflictsAlexander Tseung2018-03-301-10/+10
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-291-1/+1
* Fix merge conflictsAlexander Tseung2018-03-271-82/+107
* Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension int...Alexander Tseung2018-02-091-0/+6
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-0/+106