m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Code
7,500 Commits 2 Branches 0 Tags 265 MiB
4759915856
Commit Graph

103 Commits

Author SHA1 Message Date
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
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
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
a0df4b6892 Correct proptypes for t in new-account/create-form.js 2018-03-22 12:36:13 -02:30
Dan
a82631791e Lint fixes 2018-03-21 23:48:10 -02:30
Dan
18f8583529 Fix references to undefined 'this.props' 2018-03-21 23:10:28 -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
Dan
edd5c38492 Fix translations whose substitutions params were not in arrays. 2018-03-14 12:34:13 -02:30
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 Finlay
abe8bc19a8
Merge branch 'master' into i18n 2018-03-06 20:13:53 -08: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
Thomas
ee254b4f6f Import Account disclaimer 2018-03-02 18:24:09 -08:00
Thomas
50f20358c1 Add import account disclaimer 2018-02-27 12:01:09 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00
Dan J Miller
971112d413 [NewUI] Updates capitalization and alignment for the import account screen. (#3122) 
* Updates capitalization and alignment for the import account screen.

* Align elements in import form.
 2018-01-31 13:41:13 -08:00
Dan J Miller
8378445112 [NewUI] Set default new account name as placeholder, but not value (#3121) 
* Set default new account name as placehold, and not value, in new account create screen.

* Set new account number in create-form.js in constructor.
 2018-01-31 13:40:14 -08:00
Dan Finlay
11a944719f Add warning when importing no valid file 
Fixes #3089
 2018-01-30 15:11:05 -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
99898ac775 better organization of locale file; i18n in more view files 2018-01-23 22:14:47 -10:00
Dan
2bc85ea72f Fix input box padding and select highlight in new account create and import page. 2018-01-12 13:42:51 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
Chi Kei Chan
e61ba93194 Merge branch 'master' into merge-master 2017-11-15 12:03:13 -08:00
Daijiro Wachi
0bfa10e501 Remove warning message when show import page 
Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
 2017-10-30 20:04:44 +01:00
Dan
0ed1add110 Clear import error state on logout. 2017-10-26 12:27:09 -07:00
Chi Kei Chan
e263ae9421 Update Import Account Help Link 2017-10-25 00:38:20 -07:00
Chi Kei Chan
085551b7e6 New Account modal 2017-10-17 22:38:07 -07:00
Alexander Tseung
6defb880fb Fix SELECT TYPE dropdown changing sizes based on error message (#2359) 2017-10-13 13:23:50 -07:00
Dan Finlay
a22adec66f Replace ui with responsive-ui 2017-07-24 17:05:07 -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
Thomas Huang
d5f0ee4f5e Add Back Button for Import Screen 2017-06-27 18:40:47 -07:00
Kevin Serrano
a8ababe2f4
Add a new warning for file import JSON 2017-06-14 10:13:07 -07:00
Dan Finlay
b4e6ea9db7 Fix fiat rendering 
Fixes #1439.

When reorganizing fiat-value component to not use global state, had missed its necessary `currentCurrency` parameter.

This now passes it in wherever it's used.
 2017-05-16 11:36:21 -07:00