6273 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Lazaridis	e1d6398b0f	moves setup-related code towads end of file, re #3568	2018-03-16 18:37:56 +02:00
Alexander Tseung	7fb27cf0c7	Update margins for consistency in first time flow (#3588)	2018-03-16 08:50:21 -07:00
matteopey	b3c3f50cf9	Clients because we mean Ethereum clients	2018-03-16 14:55:49 +01:00
matteopey	51f85b8021	Fix as requested by review	2018-03-16 14:53:57 +01: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
Lazaridis	bb6af25e20	add ESLint exceptions for //= and //-, re #3568	2018-03-16 03:22:10 +02:00
Lazaridis	904f00e8ac	group all vault/keyring related methods together, re #3568	2018-03-16 02:29:53 +02: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
Lazaridis	d8f5150aa5	adds initial documentation, re #3568	2018-03-16 00:27:10 +02:00
kumavis	67e87a4fd4	Merge pull request #3576 from Senshii/master ... fix plural in french translation	2018-03-15 13:07:21 -07:00
matteopey	8b065443f2	Add italian translation	2018-03-15 18:45:49 +01:00
frankiebee	e51ba2e75c	Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-extension into retry-tx-refractor	2018-03-15 10:41:55 -07:00
frankiebee	74e9a5c491	add to CHANGELOG.md	2018-03-15 10:41:25 -07:00
frankiebee	4c947d466c	Merge branch 'master' into retry-tx-refractor	2018-03-15 09:47:25 -07:00
Alexander Tseung	66193c823c	Update Deposit Eth icon (#3569)	2018-03-15 13:50:22 -02:30
frankiebee	cd721f52cb	Merge branch 'master' into retry-tx-refractor	2018-03-15 08:07:16 -07:00
frankiebee	a087546148	Merge branch 'master' into retry-tx-refractor	2018-03-15 08:06:05 -07:00
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
Marvin Vista	dff09cf95d	Translate to Tagalog #3535 ... Changed some special characters	2018-03-15 15:02:36 +08:00
Marvin Vista	d2d0e2324b	Translate to Tagalog #3535	2018-03-15 14:58:26 +08: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
Dan	b0122be3c9	Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not edited.	2018-03-14 22:45:10 -02:30
Dan	66422cd083	Force gas min has correct precision and is set when editing gas if max.	2018-03-14 22:29:43 -02:30
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	6306c7b190	Merge branch 'master' into selenium-e2e	2018-03-14 13:29:47 -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
Dan	a4c6a5e92e	Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions.	2018-03-14 17:10:59 -02:30
Dan	fb838da734	Revert 'Set txMeta.time to reflect time of tx approval.'	2018-03-14 17:07:09 -02:30
kumavis	5d970be4f3	Merge pull request #3562 from MetaMask/danfinlay-patch-1 ... Grammar correction	2018-03-14 12:17:52 -07:00
Dan	f428bc7b1e	Merge branch 'master' into retry-tx-refractor	2018-03-14 16:35:32 -02:30
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
kumavis	c4e90c9359	local-store - check for error from extension.runtime	2018-03-14 10:49:54 -07:00
kumavis	39a831e2a0	deps - use pify instead of util.promisify	2018-03-14 10:32:55 -07:00