1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Commit Graph

32 Commits

Author SHA1 Message Date
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
Dan
0a711f0de0 Removes t from props via metamask-connect and instead places it on context via a provider. 2018-03-29 12:42:38 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
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
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
Dan
2420ad2477 Correct merge conflict resolution errors. 2018-03-06 22:26:13 -03:30
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -08:00
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -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
bad70eb1b3 first steps to i18n 2018-01-22 23:48:03 -10:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Alexander Tseung
b8310ac62e Fix logging out of old UI causing infinite spinner (#2914) 2018-01-11 15:49:10 -08:00
Dan
0feb5b210b Hides the sidebar after the an account menu actions changes the screen behind the sidebar. 2017-12-20 10:17:29 -08:00
Alexander Tseung
dde39e82b5 Add routes for mascara 2017-12-14 14:11:23 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
Dan
0ed1add110 Clear import error state on logout. 2017-10-26 12:27:09 -07:00
Alexander Tseung
3d8182f5d5 Add Info section 2017-10-25 12:16:47 -07:00
Chi Kei Chan
3891cf1af6 Fix clickable area on logout 2017-10-24 00:16:19 -07:00
Chi Kei Chan
4401800a42 Account menu white check mark 2017-10-24 00:13:49 -07:00
Chi Kei Chan
a63373401b New Sidebar uplift 2017-10-23 23:59:21 -07:00
Chi Kei Chan
6d3f261b2f Change LOOSE label to IMPORTED 2017-10-23 23:11:47 -07:00
Chi Kei Chan
376ae032fe Fix selectors 2017-10-19 12:47:44 -07:00
Chi Kei Chan
085551b7e6 New Account modal 2017-10-17 22:38:07 -07:00
Chi Kei Chan
5ee6e4d3b3 wip 2017-10-17 22:38:00 -07:00
Chi Kei Chan
81f62a7443 Adding Account Dropdown V2 2017-10-13 02:11:01 -04:00