5782 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan	4d1793b0ec	Merge branch 'master' into i18n-translator-redux	2018-03-19 16:40:48 -02:30
Dan	09260f9c5e	Fixed t() calls where localeMessages is missing; and fix incorrect connect reference.	2018-03-19 16:39:37 -02:30
Dan	5733820024	Merge branch 'master' into i18n-translator-redux	2018-03-19 14:39:04 -02:30
Thomas Huang	424e98f6a8	Merge pull request #3594 from danjm/i3344-improve-currency-input ... Currency input defaults to empty string	2018-03-19 09:20:04 -07:00
Dan	98f934fb53	Delete commented out code from i18n implementation that used globals.	2018-03-19 13:38:22 -02:30
Dan	3191f2aa5e	Delete old i18n helper files.	2018-03-19 13:37:07 -02:30
Dan	a51e8f6a16	Fetch localeMessages in front end only.	2018-03-19 13:36:16 -02:30
Dan	62a95139e6	Use customized react-trigger-change in send-new-ui integration tests..	2018-03-19 12:57:58 -02:30
anticlimactic	a1db40047c	Remove unused files from ui folder. (#3577) ... * Removed unused UI files. Fixes #3434. * Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.	2018-03-19 12:41:24 -02:30
Dan J Miller	9b38a77f46	Make entire gray container of 'reveal seed phrase' a clickable area. (#3596)	2018-03-19 12:38:16 -02:30
kumavis	02d2b3db43	Merge pull request #3555 from mamiM/mamiM-Ja-translation ... Translation to Japanese #3536	2018-03-17 14:30:49 -07:00
kumavis	627a5af66a	Merge pull request #3560 from Orangem21/master ... Translate to Chinese (Mandarin) #3529	2018-03-17 14:28:56 -07:00
kumavis	61e7f19af6	Merge pull request #3602 from vietlq/master ... Vietnamese Translation	2018-03-17 14:24:40 -07:00
kumavis	9b0c652a14	Merge pull request #3564 from nujabes403/patch-1 ... Translate to Korean #3563	2018-03-17 14:16:10 -07:00
Dan Finlay	3a264fb205	Merge pull request #3603 from vietlq/patch-2 ... Small edits to Chrome guide	2018-03-17 14:06:32 -07:00
Viet Le	6601bc5eff	space	2018-03-17 20:56:28 +00:00
Viet Le	0dd2f918b3	corrected vn -> vi	2018-03-17 20:49:19 +00:00
Le Quoc Viet	e34355ca21	Update add-to-chrome.md	2018-03-17 20:33:20 +00:00
Le Quoc Viet	c0a2996d35	Small edits	2018-03-17 19:56:10 +00:00
Viet Le	2a1a9c2215	Translated to Vietnamese. Translator: Trang Ha, Editor: Viet Le	2018-03-17 19:19:10 +00:00
Alexander Tseung	4512243290	Fix styling on confirm-send-ether and confirm-send-token (#3600)	2018-03-16 16:39:00 -07:00
Dan Finlay	3bc8493166	Merge pull request #3590 from SaptakS/feature/whitelist ... Inject Script: Blacklist domains where not to inject script	2018-03-16 15:48:08 -07:00
Alexander Tseung	6f749e5576	Update Confirm Contract screen (#3597)	2018-03-16 13:09:49 -07:00
Saptak Sengupta	6174c00c10	Inject Script: Blacklist domains where not to inject script ... Put a blacklist domain check where if the page url is in the list of blacklisted domains, we shouldn't inject script in that web page.	2018-03-17 01:02:08 +05:30
Dan	a348b60735	Currency input defaults to empty string	2018-03-16 15:38:29 -02:30
Thomas Huang	ad9feee637	Fix messages typo (#3591)	2018-03-16 14:30:27 -02:30
Alexander Tseung	7fb27cf0c7	Update margins for consistency in first time flow (#3588)	2018-03-16 08:50:21 -07:00
nujabes403	0a725285b4	Update messages.json	2018-03-16 14:27:56 +09:00
nujabes403	7432b13b33	Update messages.json	2018-03-16 14:26:40 +09:00
nujabes403	6fa8de6e93	Update messages.json	2018-03-16 14:24:41 +09:00
nujabes403	4be9d146db	Update messages.json	2018-03-16 14:22:36 +09:00
nujabes403	55d0ffd4a0	Update messages.json	2018-03-16 14:22:09 +09:00
Dan	5fe0be722b	Handle i18n with redux.	2018-03-15 21:59:45 -02:30
Dan Finlay	e2f340b324	Merge pull request #3587 from MetaMask/i18n ... More for i18n	2018-03-15 17:22:31 -07:00
Thomas	9523dd6266	More for i18n	2018-03-15 16:05:49 -07:00
kumavis	67e87a4fd4	Merge pull request #3576 from Senshii/master ... fix plural in french translation	2018-03-15 13:07:21 -07:00
Alexander Tseung	66193c823c	Update Deposit Eth icon (#3569)	2018-03-15 13:50:22 -02:30
simon fourdinier	09fe5ed9ba	fix plural in french translation	2018-03-15 09:37:00 +01:00
Le Quoc Viet	04079455e3	Merge pull request #1 from MetaMask/master ... Merge from the source	2018-03-15 08:11:42 +00:00
nujabes403	9cd9b16689	Translated whole message in KR	2018-03-15 12:14:00 +09:00
Orange	d79ef5bf15	fix ... change loose => 疏松； change imported => 已导入私钥	2018-03-15 09:27:31 +08:00
kumavis	eb5a84975b	ui - settings - add option to set current locale	2018-03-14 17:11:41 -07:00
Mami Mordovets	e781ba2c55	Translation to Japanese	2018-03-14 16:44:30 -07:00
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -07:00
Thomas Huang	e2efc91aee	Merge pull request #3558 from MetaMask/fix-two-translations ... Fix translations whose substitutions params were not in arrays.	2018-03-14 13:00:42 -07:00
kumavis	5d970be4f3	Merge pull request #3562 from MetaMask/danfinlay-patch-1 ... Grammar correction	2018-03-14 12:17:52 -07:00
kumavis	6bdef5f4c8	Merge pull request #3545 from vincentlg/master ... Add French translation 🇫🇷	2018-03-14 11:47:53 -07:00
Dan Finlay	19b553907c	Merge pull request #3565 from MetaMask/local-store-fix ... Fix local store promisification	2018-03-14 11:27:24 -07:00
kumavis	6aef2ed0b2	local-store - fix class syntax	2018-03-14 10:59:47 -07:00