1540 Commits

Author	SHA1	Message	Date
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
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
Dan	d2bd5687e8	Merge branch 'master' into i18n-translator-redux	2018-03-27 10:17:48 -02:30
frankiebee	0a2616a37f	include migration 22	2018-03-26 18:12:16 -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
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	4f0881e41b	Merge branch 'master' into i18n-translator-redux	2018-03-26 16:13:49 -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
Dan	b9309f689b	Use extension api to get initial locale.	2018-03-22 12:49:19 -02:30
Dan	be845fd190	Merge branch 'master' into i18n-translator-redux	2018-03-21 22:28:58 -02:30
kumavis	5d3246c836	Merge branch 'master' of https://github.com/trigun0x2/metamask-extension into trigun0x2-master	2018-03-21 11:55:09 -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
kumavis	1a60094d50	Merge pull request #3504 from lazaridiscom/laz/i3427 ... adds READMEs to folders, re #3427	2018-03-20 16:28:47 -07:00
kumavis	29cc2f8ab9	Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux	2018-03-20 13:01:08 -07:00
Jeffrey Tong	93495b2809	fix for lint	2018-03-20 12:18:48 -07:00
Dan	2ddc2cc1fb	Lint fixes.	2018-03-19 16:53:06 -02:30
Dan	d8788af9b8	Merge branch 'master' into retry-tx-refractor	2018-03-19 15:30:47 -02:30
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
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
Lazaridis	e1d6398b0f	moves setup-related code towads end of file, re #3568	2018-03-16 18:37:56 +02: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
Lazaridis	d8f5150aa5	adds initial documentation, re #3568	2018-03-16 00:27:10 +02:00
frankiebee	cd721f52cb	Merge branch 'master' into retry-tx-refractor	2018-03-15 08:07:16 -07:00
kumavis	34aeef50a0	i18n - load locales manually	2018-03-14 16:32:35 -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
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
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
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
frankiebee	9d7640996a	transactions - return the txMeta in retryTransaction	2018-03-13 14:42:26 -07: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