aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/import/index.js
Commit message (Expand)AuthorAgeFilesLines
* i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-221-8/+7
* Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-211-3/+3
|\
| * i18n Import flowThomas2018-03-211-3/+3
* | Lint fixes.Dan2018-03-201-0/+1
* | Handle i18n with redux.Dan2018-03-161-5/+5
* | i18n - load locales manuallykumavis2018-03-151-6/+4
|/
* Merge branch 'master' into i18nDan Finlay2018-03-071-0/+15
|\
| * Import Account disclaimerThomas2018-03-031-9/+2
| * Add import account disclaimerThomas2018-02-281-0/+22
* | Merge branch 'master' into i18nDan2018-03-071-1/+1
|\|
| * [NewUI] Updates capitalization and alignment for the import account screen. (...Dan J Miller2018-02-011-1/+1
* | complete i18n across new UINick Doiron2018-01-301-4/+5
|/
* New add account page with create and import options.Dan2018-01-131-29/+5
* Merge branch 'master' into merge-masterChi Kei Chan2017-11-161-0/+1
|\
| * Remove warning message when show import pageDaijiro Wachi2017-10-311-0/+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-211-0/+100
* | Make folder for responsive UIDan Finlay2017-07-041-100/+0
|/
* Add Back Button for Import ScreenThomas Huang2017-06-281-0/+9
* Fix linting warningsThomas Huang2017-04-271-1/+1
* Implement naieve JSON file importingDan Finlay2017-01-191-3/+3
* Allow importing of private key stringsDan Finlay2017-01-181-6/+15
* Develop import subviewsDan Finlay2016-11-051-15/+27
* Add import account placeholder templateDan Finlay2016-11-051-0/+70