aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/import/json.js
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into i18n-translator-reduxDan2018-03-271-2/+2
|\
| * Update button stylesAlexander Tseung2018-03-261-2/+2
* | Lint fixesDan2018-03-221-1/+1
* | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-221-9/+8
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-211-1/+1
|\|
| * i18n Import flowThomas2018-03-211-2/+2
* | Lint fixes.Dan2018-03-201-0/+1
* | Handle i18n with redux.Dan2018-03-161-9/+9
* | i18n - load locales manuallykumavis2018-03-151-2/+3
|/
* Add i18n back into JsonImportSubviewThomas2018-03-121-7/+7
* Merge branch 'master' into i18nThomas Huang2018-03-121-78/+102
|\
| * Explicitly define state in import account from json component (#3491)Alexander Tseung2018-03-091-78/+102
* | Merge branch 'master' into i18nDan2018-03-071-0/+6
|\|
| * Merge branch 'master' into uatDan2018-02-081-0/+6
| |\
| | * Add warning when importing no valid fileDan Finlay2018-01-311-0/+6
* | | complete i18n across new UINick Doiron2018-01-301-4/+4
* | | separate out cross-browser i18n for extensionsNick Doiron2018-01-251-0/+1
* | | better organization of locale file; i18n in more view filesNick Doiron2018-01-241-7/+7
|/ /
* | New add account page with create and import options.Dan2018-01-131-20/+20
* | Update Import Account Help LinkChi Kei Chan2017-10-251-1/+1
* | 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 a new warning for file import JSONKevin Serrano2017-06-151-0/+3
* Fix styling of error message.Kevin Serrano2017-03-231-2/+1
* Implement naieve JSON file importingDan Finlay2017-01-191-2/+73
* Develop import subviewsDan Finlay2016-11-051-0/+27
generated by cgit (git 2.34.1) at 2024-10-17 15:26:58 +0800