aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/accounts/import
Commit message (Expand)AuthorAgeFilesLines
* Removes t from props via metamask-connect and instead places it on context vi...Dan2018-03-294-25/+48
* Merge branch 'master' into i18n-translator-reduxDan2018-03-272-4/+4
|\
| * Update button stylesAlexander Tseung2018-03-262-4/+4
* | Lint fixesDan2018-03-222-4/+2
* | Fix references to undefined 'this.props'Dan2018-03-221-12/+10
* | i18n redux solution doesn't require importing t() and passing state to each t...Dan2018-03-224-24/+20
* | Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-tra...kumavis2018-03-212-4/+4
|\|
| * i18n Import flowThomas2018-03-212-5/+5
* | Lint fixes.Dan2018-03-202-0/+2
* | Handle i18n with redux.Dan2018-03-164-23/+23
* | i18n - load locales manuallykumavis2018-03-154-10/+9
|/
* 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 i18nDan Finlay2018-03-071-0/+15
|\|
| * Import Account disclaimerThomas2018-03-031-9/+2
| * Add import account disclaimerThomas2018-02-281-0/+22
* | Correct merge conflict resolution errors.Dan2018-03-071-2/+0
* | Merge branch 'master' into i18nDan2018-03-073-7/+20
|\|
| * Merge branch 'uat' into uat-nextDan2018-02-081-0/+6
| |\
| | * Merge branch 'master' into uatDan2018-02-081-0/+6
| | |\
| | | * Add warning when importing no valid fileDan Finlay2018-01-311-0/+6
| * | | [NewUI] Updates capitalization and alignment for the import account screen. (...Dan J Miller2018-02-012-8/+13
| |/ /
* | | complete i18n across new UINick Doiron2018-01-303-12/+13
* | | separate out cross-browser i18n for extensionsNick Doiron2018-01-253-0/+3
* | | better organization of locale file; i18n in more view filesNick Doiron2018-01-243-13/+12
|/ /
* | New add account page with create and import options.Dan2018-01-133-77/+58
* | 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
generated by cgit (git 2.34.1) at 2024-10-14 22:17:53 +0800