6096 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
kumavis	481983aae8	local-store - fix promisification of methods	2018-03-14 10:31:25 -07:00
nujabes403	70ae807618	Update kr translation to messages.json	2018-03-15 02:25:01 +09:00
Vincent Le Gallic	9963bf6429	Update messages.json ... thx to @Senshii	2018-03-14 18:08:14 +01:00
Dan Finlay	fae6a44bac	Grammar correction	2018-03-14 09:34:25 -07:00
Orange	95742596e3	Merge pull request #2 from MetaMask/master ... update	2018-03-15 00:20:32 +08:00
Dan	e888ef9c13	Merge branch 'master' into retry-tx-refractor	2018-03-14 13:22:33 -02:30
Dan Finlay	9226de6c95	Merge pull request #3559 from MetaMask/fix-promisify-ref ... fix destructuring of variables	2018-03-14 08:45:56 -07:00
frankiebee	b609924125	fix destructuring of variables	2018-03-14 08:21:50 -07:00
Orange	94a3331bc1	Merge pull request #1 from Orangem21/yuanaichi ... 中文翻译	2018-03-14 23:21:05 +08:00
frankiebee	bc987a1129	fix destructuring of variables	2018-03-14 08:20:54 -07:00
Orange	d2fb1c2b82	fix ... fix 接收 to 接受	2018-03-14 23:19:08 +08:00
Dan	edd5c38492	Fix translations whose substitutions params were not in arrays.	2018-03-14 12:34:13 -02:30
Dan	f8e13fd793	Fix tests.	2018-03-14 12:28:26 -02:30
yuanchao	f595e8f424	yuanaichi	2018-03-14 22:37:28 +08:00
Dan	106ce091a9	Fix TransactionStateManager spelling.	2018-03-14 11:45:04 -02:30
Lazaridis	2d3763d709	add READMEs to folders, re #3427	2018-03-14 15:33:22 +02:00
Orange	fd5bdb3241	fix ... fix	2018-03-14 15:15:56 +08:00
Mami Mordovets	8299ab438a	Translation to Japanese	2018-03-14 14:33:26 +09:00
Orange	5fa8e83b3c	fix ... fix	2018-03-14 11:13:52 +08:00
Dan	798988597b	Merge branch 'master' into retry-tx-refractor	2018-03-14 00:02:27 -02:30
Dan	cc267d6c81	Fix more lint errors.	2018-03-13 23:56:45 -02:30
Dan	c37684d7bd	Remove unnecessary addition of nonce to state.	2018-03-13 23:49:10 -02:30
Dan	e94a14ef8a	Make token confirmations compatible.	2018-03-13 23:44:05 -02:30
Dan	0d33aed20e	Fix tx-list-item submitted check.	2018-03-13 23:29:47 -02:30
Dan	bf3c5add08	Adds styles for dropped txs in old-ui.	2018-03-13 22:17:08 -02:30
Dan	80a2e59194	Correctly set latest submitted retry with nonces that matches others in old-ui transaction-list-item.	2018-03-13 22:08:27 -02:30
Dan	c52253bb0e	Use correct name for submittedTime field in tx-list.js	2018-03-13 21:57:23 -02:30