2136 Commits

Author	SHA1	Message	Date
Alexander Tseung	51ad2b03c8	Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254	2018-03-30 16:34:57 -07:00
Alexander Tseung	ba23843f91	Fix merge conflicts	2018-03-30 16:18:48 -07:00
frankiebee	3def45004a	transactions#newUnapprovedTransaction - dont default origin to metamask	2018-03-30 16:00:11 -07:00
frankiebee	03b123a85d	transactions - put the origing on the txMeta to help with debugging	2018-03-30 15:48:39 -07:00
kumavis	b49ad750dd	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-29 16:54:00 -07:00
Nico	011bdd2d6e	i18n - Update German Locale	2018-03-29 11:18:49 -07:00
Alexander Tseung	ef61ef2ce8	Fix i18n merge conflicts	2018-03-29 09:37:29 -07:00
FBrinkkemper	1b2674119e	changed zaad -> back-up woorden ... Zaad sounds strange in Dutch. Back-up woorden (back-up words) are a better translation in Dutch. Back-up is also a Dutch phrase, like it is in English.	2018-03-29 12:30:59 +02:00
kumavis	253abd60fc	build - extension - move js files to toplevel	2018-03-28 21:29:57 -07:00
Gornov Dmitry	55e15ee7c6	Modified Russian localization. resolves #3534, #3644	2018-03-29 02:18:18 +02:00
Frankie	650b716f55	Merge pull request #3782 from MetaMask/i3670-FixNonceBug ... Add test for suspected nonce bug	2018-03-28 14:38:40 -07:00
Dan Finlay	f50a7a8fe8	Rename variable to be more understandable	2018-03-28 14:18:03 -07:00
kumavis	bedc1d1a47	Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts	2018-03-28 14:12:20 -07:00
kumavis	5815de33fb	build - rename 'popup.js' to 'ui.js'	2018-03-28 14:04:33 -07:00
kumavis	5834c13769	ui - change window title 'MetaMask Plugin' to 'MetaMask'	2018-03-28 13:37:02 -07:00
Frankie	8766420f19	Merge pull request #3777 from MetaMask/etc-fixes ... Sentry spam fix and etc fixes	2018-03-28 12:57:01 -07:00
Frankie	06112b3e30	Merge pull request #3765 from MetaMask/sentry-error-simplify ... sentry - simplify error message 'Transaction Failed: known transaction'	2018-03-28 12:55:52 -07:00
kumavis	c4c459c8d7	controllers - currency - warn currency and encountered error	2018-03-28 09:41:25 -07:00
kumavis	21fbaed97c	tx controller - explode on non-hex txParams + dont add chainId to txParams + sign with chainId as number	2018-03-27 23:55:18 -07:00
kumavis	97e1fcd331	sentry - simplify error message 'Transaction Failed: known transaction'	2018-03-27 20:41:10 -07:00
kumavis	8421cf1954	i18n - fix casing for key 'downloadStateLogs'	2018-03-27 19:59:45 -07:00
Frankie	76e83365ca	Merge pull request #3752 from MetaMask/sentry-error-fix ... sentry - simplify all ethjs errors for better batching	2018-03-27 19:13:42 -07:00
kumavis	f7a2dc984e	Merge pull request #3760 from MetaMask/i3439-ResetCacheOnAccountReset ... Fix bug where resetAccount does not clear network cache	2018-03-27 19:10:31 -07:00
kumavis	d8357413ac	metamask-controller - fix typo	2018-03-27 19:04:28 -07:00
kumavis	b4ec68b2d4	i18n - fix locales inde	2018-03-27 18:29:54 -07:00
Dan Finlay	729a473210	Fix bug where resetAccount does not clear network cache ... Fixes #3439	2018-03-27 18:07:51 -07:00
kumavis	165ae7d193	i18n - derrive locale codes from index	2018-03-27 18:07:24 -07:00
kumavis	9482af6157	i18n - add locales index json	2018-03-27 17:52:26 -07:00
kumavis	5290570c8f	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-27 17:17:04 -07:00
frankiebee	fefbf40a06	Merge branch 'master' into i#3731	2018-03-27 16:50:57 -07:00
frankiebee	f0f45e6fe1	migration for removing unnecessary transactions from state	2018-03-27 16:49:13 -07:00
kumavis	914a098c8a	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-27 14:28:37 -07:00
kumavis	651e48dbd6	sentry - simplify all ethjs errors for better batching	2018-03-27 12:37:30 -07:00
kumavis	0fe0d8b7a5	Merge pull request #3739 from gasolin/zhtwfix ... [zh-TW] fix translation and add missing strings	2018-03-27 09:21:40 -07:00
Dan	f74e802026	Undo unnecessary line removals.	2018-03-27 10:52:19 -02:30
Dan	be2254b880	Remove comments and console.logs	2018-03-27 10:37:45 -02:30
R.IIzuka	bfa62f719f	Update messages.json ... Fixed Japanese phrases. Add some translations.	2018-03-27 22:05:37 +09:00
Dan	d2bd5687e8	Merge branch 'master' into i18n-translator-redux	2018-03-27 10:17:48 -02:30
Alexander Tseung	6f367a5a6b	Fix merge conflicts	2018-03-27 00:20:35 -07:00
gasolin	81e2ab20d9	[zh-TW] fix translation and add missing strings	2018-03-27 10:27:19 +08:00
frankiebee	0a2616a37f	include migration 22	2018-03-26 18:12:16 -07:00
kumavis	e0576d0526	v4.4.0	2018-03-26 17:05:52 -07:00
frankiebee	43dde3cbde	transactions - only save up to 40 txs totall across all networks	2018-03-26 15:58:36 -07:00
Dan Finlay	e196b6dcb7	Fix bug where full localStorage would crash on start	2018-03-26 15:25:26 -07:00
Thomas Huang	b0fae2ca39	Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate ... Updates Add token screen to latest design.	2018-03-26 14:55:30 -07:00
Frankie	5a61a6d57a	migration for adding submittedTime to the txMeta (#3727) ... * test for migration 022 * write migration 022 adding submittedTime to txMetas whove been submitted	2018-03-26 14:24:12 -07:00
Dan	1779cff65b	Merge branch 'master' into i3326-addtokenscreendesignupdate	2018-03-26 16:51:02 -02:30
Filip Š	b2f454a03c	i18n - sl Slovenian translation (#3724)	2018-03-26 11:57:04 -07:00
gasolin	d1927d1407	i18n - zh_tw traditional chinese (taiwanese) ... * translate to Traditional Chinese, fix #3529	2018-03-26 11:53:36 -07:00
kumavis	1941260f66	Merge pull request #3711 from artiya4u/feature/thai_locale ... Add Translate to Thai #3543	2018-03-26 11:50:21 -07:00
Dan	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -02:30
artiya4u	47ee86e9fd	Update Thai translate.	2018-03-24 11:59:23 +07:00
artiya4u	3db8b84eff	Update Thai translate.	2018-03-24 11:20:21 +07:00
artiya4u	33f43a7e7a	Update Thai translate.	2018-03-24 11:06:49 +07:00
Dan	fa022e0883	Updates Add token screen to latest design.	2018-03-24 01:13:43 -02:30
kumavis	46e8781e41	lint - fix	2018-03-23 18:45:58 -07:00
kumavis	2eaac897bf	sentry - namespace files under metamask dir	2018-03-23 18:37:41 -07:00
kumavis	e3d7062e9b	sentry - rewrite report urls + use raven-js from npm	2018-03-23 17:22:44 -07:00
artiya4u	4c15a121a3	๊๊Update Thai translate.	2018-03-24 02:38:31 +07:00
artiya4u	47e09b0f2b	First add Thai translate.	2018-03-23 02:33:57 +07:00
Dan	b9309f689b	Use extension api to get initial locale.	2018-03-22 12:49:19 -02:30
Dan	d613dfb434	Correct reprice title and subtitle key names.	2018-03-22 01:19:00 -02:30
Dan	be845fd190	Merge branch 'master' into i18n-translator-redux	2018-03-21 22:28:58 -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	9362239231	v4.3.0	2018-03-21 14:16:00 -07:00
kumavis	278e1ba61e	Merge pull request #3656 from MetaMask/trigun0x2-master2 ... Prevent batch request from opening multiple windows (3)	2018-03-21 12:42:03 -07:00
kumavis	a80be4c8c3	Merge pull request #3648 from raulk/patch-1 ... Minor adjustments to Spanish translation	2018-03-21 12:33:52 -07:00
kumavis	1343f5ede4	Merge branch 'master' of github.com:MetaMask/metamask-extension into trigun0x2-master	2018-03-21 11:55:24 -07:00
kumavis	5d3246c836	Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master	2018-03-21 11:55:09 -07:00
kumavis	dc4752c703	i18n - fix german json formatting	2018-03-21 11:44:31 -07:00
Nico	1eee1909ac	Tranlate to German (#3575) ... Translation into German	2018-03-21 11:41:17 -07:00
Victor Charapaev	ec1188f250	Translate to Russian (#3644) ... * Add Russian localization	2018-03-21 11:37:54 -07:00
N1X	332a0203ac	hn _locales : message.json [HINDI] (#3611) ... adding hn_IN `_locales`	2018-03-21 11:33:32 -07:00
Raúl Kripalani	759b65ddf9	Minor adjustments to Spanish translation	2018-03-21 10:51:44 +00:00
kumavis	cbaa70751b	Merge pull request #3625 from bradford-hamilton/master ... add Dutch translations	2018-03-20 17:14:16 -07:00
kumavis	1b27edca4d	Merge pull request #3641 from hermanjunge/master ... Nuke the es_419 locale	2018-03-20 16:55:35 -07:00
kumavis	112a9443ee	Merge pull request #3585 from lazaridiscom/laz/i3568 ... [WIP] document/rearrange metamask-controller.js, re #3568	2018-03-20 16:47:04 -07:00
Herman Junge	ac34c8f480	Nuke the es_419 locale	2018-03-20 20:43:20 -03:00
kumavis	1a60094d50	Merge pull request #3504 from lazaridiscom/laz/i3427 ... adds READMEs to folders, re #3427	2018-03-20 16:28:47 -07:00
Herman Junge	89acc955fa	last pass (for now)	2018-03-20 20:08:09 -03:00
Herman Junge	7e614ec6db	all 286 english strings were found in your locale	2018-03-20 19:49:10 -03:00
Herman Junge	1cc1737d42	all 264 strings declared in your locale were found in the english one	2018-03-20 19:32:13 -03:00
Herman Junge	3d885cae92	alphabetic sort of spanish messages.json	2018-03-20 19:25:21 -03:00
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Bradford Lamson-Scribner	bb8b84f2fe	add Dutch translations	2018-03-20 13:22:47 -06:00
Jeffrey Tong	93495b2809	fix for lint	2018-03-20 12:18:48 -07:00
Thomas	dd19a93447	Add i18n to tx status	2018-03-20 12:06:59 -07:00
Thomas	d4eb883958	Merge branch 'master' into i3571-CompleteI18nTemplates	2018-03-20 11:35:59 -07:00
Grana69	8840f50527	Add messages.json from @Grana69	2018-03-20 15:04:22 -03:00
Thomas	2c42cfdf1e	Update onlySendToEtherAddress message	2018-03-20 11:04:15 -07:00
Thomas	4fc68ca208	Add i18n in settings/info	2018-03-20 10:56:35 -07:00
kumavis	706a943189	Merge pull request #3613 from alvesjtiago/master ... Portuguese translations.	2018-03-20 10:53:20 -07:00
kumavis	d21bf822e3	Merge pull request #3579 from matteopey/italian-translation ... Italian translation	2018-03-20 10:48:14 -07:00
kumavis	3a2f1c7c00	Merge pull request #3574 from marvinvista/master ... Tagalog Translation	2018-03-20 10:30:28 -07:00
Thomas	7a8e080245	Started on Tx list i18n	2018-03-20 10:29:22 -07:00
Thomas	de98cb4039	Remove duplicate keys	2018-03-20 02:33:46 -07:00
matteopey	ee85a9c9d0	Update translation based on the new message.json	2018-03-19 20:54:30 +01:00
Dan Finlay	f5b0d56b9d	Add send screen template	2018-03-19 12:38:14 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan Finlay	293ca6c9a6	Add template for settings and info	2018-03-19 12:03:35 -07:00
Dan Finlay	2e7d4db2de	Add recover and backup tempaltes	2018-03-19 11:43:22 -07:00
Dan Finlay	e504bc6215	Add connecting indication templates	2018-03-19 11:28:02 -07:00
Dan	d8788af9b8	Merge branch 'master' into retry-tx-refractor	2018-03-19 15:30:47 -02:30
Tiago Alves	1f132d613a	Portuguese translations.	2018-03-20 00:10:55 +07:00
Dan	5733820024	Merge branch 'master' into i18n-translator-redux	2018-03-19 14:39:04 -02:30
Dan	a51e8f6a16	Fetch localeMessages in front end only.	2018-03-19 13:36: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
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
Viet Le	2a1a9c2215	Translated to Vietnamese. Translator: Trang Ha, Editor: Viet Le	2018-03-17 19:19:10 +00: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
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
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
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	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
simon fourdinier	09fe5ed9ba	fix plural in french translation	2018-03-15 09:37:00 +01: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
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
kumavis	6bdef5f4c8	Merge pull request #3545 from vincentlg/master ... Add French translation 🇫🇷	2018-03-14 11:47:53 -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	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
Orange	95742596e3	Merge pull request #2 from MetaMask/master ... update	2018-03-15 00:20:32 +08:00
frankiebee	b609924125	fix destructuring of variables	2018-03-14 08:21:50 -07: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
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
kumavis	dc5fbf5eb2	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-13 15:43:37 -07:00
kumavis	22cd788203	tx-gas-utils - fix code style	2018-03-13 15:39:33 -07:00
frankiebee	e5a83d3f1a	transactions move validation of the to field to validateRecipient	2018-03-13 15:32:03 -07:00
frankiebee	a2c14ad02b	Merge remote-tracking branch 'origin/i#3509' into i#3509	2018-03-13 15:27:26 -07:00
frankiebee	c465d510b1	fix error message	2018-03-13 15:26:45 -07:00
Frankie	c83a9ceb04	Merge branch 'master' into i#3509	2018-03-13 15:23:46 -07:00
frankiebee	d195cfab50	transactions - insure if a to field in tx params has a truthy valu that it is a valid addres and if it is falsy that it is not null to fix issue #3509	2018-03-13 15:13:05 -07:00
kumavis	e48934dc04	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-13 14:49:26 -07:00
frankiebee	9d7640996a	transactions - return the txMeta in retryTransaction	2018-03-13 14:42:26 -07:00
Vincent Le Gallic	c15d3e0e23	Add French translation	2018-03-13 22:04:13 +01:00
Orange	c33eeb0d3e	update ... update	2018-03-14 03:21:31 +08:00
frankiebee	9fd349d740	transactions:state - add a submittedTime stamp so the ui has a better grasp of the time of submission	2018-03-13 09:51:37 -07:00
Thomas	f7138d81e3	Add sigRequest for Signature Request	2018-03-12 11:41:26 -07:00
Thomas Huang	b7c7083a11	Merge branch 'master' into i18n	2018-03-12 10:50:55 -04:00
Jeffrey Tong	4f853bbd3c	remove console log	2018-03-11 10:18:55 -07:00
Jeffrey Tong	bda493dc9d	add comments that need clarification on naming convention	2018-03-11 10:17:08 -07:00
Dan	81e72147ef	Merge branch 'master' into retry-tx-refractor	2018-03-09 02:07:27 -03:30
kumavis	a88e436b7d	lint fix	2018-03-08 14:55:35 -08:00
kumavis	455faece9e	Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead	2018-03-08 14:14:49 -08:00
kumavis	98efca0a97	background - storage - cleanup storage wiring	2018-03-08 14:10:28 -08:00
frankiebee	5572345b78	fix marking of confirmed transaction as dropped	2018-03-08 10:37:47 -08:00
frankiebee	4a3288fec9	transactions - make _markNonceDuplicatesDropped	2018-03-07 22:01:14 -08:00
Jeffrey Tong	aaef2aeefd	fixed multiple notification windows when executing batch	2018-03-07 20:09:40 -08:00
frankiebee	8adb03074c	Merge branch 'master' into retry-tx-refractor	2018-03-07 17:16:35 -08:00
frankiebee	62febac876	refactor retrytx with higher gas price: ... - create a new tx instead of overwriting the tx hash - add a new state 'dropped' to the txStateManager - mark duplicate txs as dropped when one gets confirmed in a block	2018-03-07 17:16:16 -08:00
Dan Finlay	f4e5dd37b1	Merge pull request #3409 from scsaba/seed-phrase-verification ... Add seed phrase verification script into background process	2018-03-07 16:47:13 -08:00
Dan Finlay	64fcd27102	Tighten up data loading code	2018-03-07 14:42:59 -08:00
Dan Finlay	b97ac5106f	Add clarifying comment	2018-03-07 14:38:26 -08:00
Dan Finlay	d58e47edec	Some fixes for new storage strategy ... - Don't persist undefined data - Write to new storage strategy without waiting for completion. - Continue writing to localStorage as fallback.	2018-03-07 14:23:31 -08:00
Jeffrey Tong	40b1688c67	removed check for width & height on multiple popup windows	2018-03-07 14:19:27 -08:00
Dan Finlay	ab55c184c7	Increase storage debounce to 2s	2018-03-07 13:50:22 -08:00
Dan Finlay	d0ba2d2d94	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-07 13:39:44 -08:00
Jeffrey Tong	cad5f5f000	fix typo in tests and tx-state-manager	2018-03-07 10:24:36 -08:00
Jeffrey Tong	57dc5a6e9b	fix typo in transaction.js	2018-03-06 20:37:26 -08:00
Dan Finlay	abe8bc19a8	Merge branch 'master' into i18n	2018-03-06 20:13:53 -08:00
kumavis	e91a521b1b	Version 4.2.0	2018-03-06 17:30:12 -08:00
Dan	7c2257e09c	Missing comma in messages.json	2018-03-06 21:25:30 -03:30
Dan	9d215bab0f	Merge branch 'master' into i18n	2018-03-06 20:45:45 -03:30
Dan Finlay	423f084cb4	Merge branch 'master' into i3076-UseStorageLocalInstead	2018-03-06 14:59:09 -08:00
Dan Finlay	dd9cac69ae	Merge pull request #3309 from scsaba/edge-support ... Add Edge Support	2018-03-06 09:39:57 -08:00
Csaba Solya	59007a6c36	modify verifySeedPhrase to async and call it from addNewAccount also	2018-03-06 15:56:27 +01:00