26 Commits

Author	SHA1	Message	Date
Dan	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30
Alexander Tseung	cfa2592d78	Update button styles	2018-03-25 22:58:04 -07:00
Dan	a82631791e	Lint fixes	2018-03-21 23:48:10 -02:30
Dan	d24a0590d3	i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props.	2018-03-21 22:11:47 -02:30
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Thomas	cffaf44714	i18n Import flow	2018-03-20 09:49:12 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -07:00
Thomas	208b3bc4c1	Add i18n back into JsonImportSubview	2018-03-12 08:07:12 -07:00
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
Alexander Tseung	4b2e52795d	Explicitly define state in import account from json component (#3491)	2018-03-09 16:30:31 +01:00
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan	d8896a8c31	Merge branch 'master' into uat	2018-02-07 16:32:47 -03:30
Dan Finlay	11a944719f	Add warning when importing no valid file ... Fixes #3089	2018-01-30 15:11:05 -08:00
Nick Doiron	abfa74f09a	complete i18n across new UI	2018-01-29 15:29:01 -05:00
Nick Doiron	7da52c5997	separate out cross-browser i18n for extensions	2018-01-24 10:10:28 -10:00
Nick Doiron	99898ac775	better organization of locale file; i18n in more view files	2018-01-23 22:14:47 -10:00
Dan	980e1bfcf8	New add account page with create and import options.	2018-01-12 13:42:51 -08:00
Chi Kei Chan	e263ae9421	Update Import Account Help Link	2017-10-25 00:38:20 -07:00
Dan Finlay	86d367957f	Move responsive ui into its own folder for easier merges	2017-07-20 12:38:38 -07:00
Dan Finlay	5eb3d5d485	Make folder for responsive UI	2017-07-03 15:39:25 -07:00
Kevin Serrano	a8ababe2f4	Add a new warning for file import JSON	2017-06-14 10:13:07 -07:00
Kevin Serrano	5d14925842	Fix styling of error message.	2017-03-22 16:54:10 -04:00
Dan Finlay	9126652f2e	Implement naieve JSON file importing ... Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.	2017-01-18 16:15:25 -08:00
Dan Finlay	b3cb675a8b	Develop import subviews	2016-11-04 15:32:02 -07:00