aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/import
Commit message (Expand)AuthorAgeFilesLines
* Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-011-80/+0
* Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-29/+5
|\
| * New add account page with create and import options.Dan2018-01-133-77/+58
* | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-153-201/+0
|/
* Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-0/+1
|\
| * Remove warning message when show import pageDaijiro Wachi2017-10-311-0/+1
* | Clear import error state on logout.Dan2017-10-271-0/+4
* | Update Import Account Help LinkChi Kei Chan2017-10-251-1/+1
* | New Account modalChi Kei Chan2017-10-181-0/+1
* | Fix SELECT TYPE dropdown changing sizes based on error message (#2359)Alexander Tseung2017-10-141-2/+4
* | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-214-0/+297
* | Make folder for responsive UIDan Finlay2017-07-044-297/+0
|/
* Add Back Button for Import ScreenThomas Huang2017-06-281-0/+9
* Add a new warning for file import JSONKevin Serrano2017-06-151-0/+3
* Fix linting warningsThomas Huang2017-04-271-1/+1
* Fix styling of error message.Kevin Serrano2017-03-232-4/+2
* Implement naieve JSON file importingDan Finlay2017-01-192-5/+76
* Added new modular private key import systemDan Finlay2017-01-191-2/+1
* Allow importing of private key stringsDan Finlay2017-01-182-6/+84
* Develop import subviewsDan Finlay2016-11-053-15/+84
* Add import account placeholder templateDan Finlay2016-11-051-0/+70