8431 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
brunobar79	c651212025	fix merge conflicts	2018-11-06 20:21:19 -05:00
Bruno Barbieri	7f944923d1	Merge pull request #5691 from MetaMask/fix-typo ... Fix typo on drizzle test description	2018-11-07 01:39:58 +01:00
brunobar79	62ac993b9a	fix typo	2018-11-06 19:22:47 -05:00
Bruno Barbieri	68138e178e	Merge pull request #5689 from MetaMask/reject-cached-approval ... EIP-1102: Clear approvals on rejection	2018-11-07 01:21:33 +01:00
brunobar79	6daf749251	update drizzle tests	2018-11-06 19:08:23 -05:00
bitpshr	5272073f4f	Revert package-lock.json	2018-11-06 14:54:37 -05:00
bitpshr	896ae0ab89	Fix lint errors	2018-11-06 14:30:50 -05:00
bitpshr	d7b1cacabc	Remove injected script tags after use	2018-11-06 14:26:02 -05:00
bitpshr	34d80f21e2	Clear cached approval after rejection	2018-11-06 14:13:27 -05:00
Dan Finlay	7b8a73b01f	Version 5.0.0 (#5685)	2018-11-06 11:42:22 -05:00
Whymarrh Whitby	f692123f51	Update the colour of the default image used on Connect Request (#5678)	2018-11-05 15:07:09 -08:00
Whymarrh Whitby	5d928e67c3	Update "Learn more" link on 1102 connect screen (#5677)	2018-11-05 15:07:09 -08:00
bitpshr	b3f428fd1f	Move experimental provider augmentation	2018-11-05 15:07:09 -08:00
bitpshr	879997af51	Add experimental RPC method support	2018-11-05 15:07:09 -08:00
Whymarrh Whitby	26ada8a828	Update Connect Request screen design (#5644) ... * Parameterize NetworkDisplay background colour * Update design for login request screen * Pass siteTitle, siteImage through for calls to ethereum.enable() * Bring the site images closer together	2018-11-05 15:07:09 -08:00
bitpshr	31cb111d2e	Do not modify isApproved when locked	2018-11-05 15:07:09 -08:00
bitpshr	9984f7edeb	Mark origins as unapproved if user explicitly locks MetaMask	2018-11-05 15:07:09 -08:00
Paul Bouchon	f557d33718	Enable caching	2018-11-05 15:07:09 -08:00
bitpshr	991e08e346	isApproved should return false	2018-11-05 15:07:09 -08:00
bitpshr	0dad394147	Disable mascara tests	2018-11-05 15:07:09 -08:00
bitpshr	01ff0bd3c0	Increase timeout in Mascara test	2018-11-05 15:07:09 -08:00
bitpshr	72730b3929	Remove internal listeners	2018-11-05 15:07:09 -08:00
bitpshr	cc27a09a1a	rebase	2018-11-05 15:07:09 -08:00
bitpshr	d4171ccea5	Disable approval caching	2018-11-05 15:07:09 -08:00
bitpshr	cc1bab6ebb	Differentiate locked and enabled	2018-11-05 15:07:09 -08:00
bitpshr	d7618bd5c6	Code bath	2018-11-05 15:07:09 -08:00
bitpshr	ba40fcbcb4	Handle logout gracefully	2018-11-05 15:07:09 -08:00
bitpshr	f02e18dd80	Fix lint issues	2018-11-05 15:07:09 -08:00
bitpshr	ace7cfa065	Only filter selectedAddress from publicConfig store	2018-11-05 15:07:09 -08:00
bitpshr	f35466a247	Fix race condition with publicConfigStore	2018-11-05 15:07:09 -08:00
bitpshr	32630b68df	Move convenience methods to _metamask namespace	2018-11-05 15:07:09 -08:00
bitpshr	504f4a50f1	Fix lint issues	2018-11-05 15:07:09 -08:00
bitpshr	84874a639d	Add isUnlocked provider hook	2018-11-05 15:07:09 -08:00
bitpshr	573139b935	Differentiate isEnabled and isApproved hook	2018-11-05 15:07:09 -08:00
bitpshr	3a2ade4e84	Update isEnabled check	2018-11-05 15:07:09 -08:00
bitpshr	c6e9caed22	Fix beta e2e tests	2018-11-05 15:07:09 -08:00
bitpshr	5fff6dcbbd	Remove duplicate i18n keys	2018-11-05 15:07:09 -08:00
bitpshr	473afa68a1	Cleanup after rebase	2018-11-05 15:07:09 -08:00
bitpshr	226601a956	EIP-1102: add user privacy option	2018-11-05 15:07:09 -08:00
bitpshr	bfcb73ad53	EIP-1102: add isEnabled convenience method to provider	2018-11-05 15:07:09 -08:00
bitpshr	89b4aa5d62	EIP-1102: Add option to force-enable provider	2018-11-05 15:07:09 -08:00
bitpshr	c76c9ca2c8	EIP-1102: updated implementation	2018-11-05 15:07:09 -08:00
Dan Finlay	2d4ff1dd82	Version 4.17.1	2018-11-05 14:05:33 -08:00
kumavis	86f09e6bb5	network - infura - hardcode net_version and eth_chainId (#5670) ... * network - infura - hardcode net_version and eth_chainId * network - infura - add rinkeby handling * lint fix	2018-11-05 14:13:37 -05:00
Esteban Miño	4489a57f2f	Update watchAsset ERC20 validation (#5653) ... * update ERC20 token valodation for watchAsset * update ERC20 validation test descriptions	2018-11-05 15:36:34 -03:30
kumavis	6883787c14	Merge pull request #5671 from MetaMask/i18n-tool-fix ... development tools - i18n verify tool - bugfix	2018-11-04 22:51:59 -05:00
kumavis	338c826961	development tools - fix i18n verify tool	2018-11-04 22:18:30 -05:00
kumavis	3ba70b5d3e	Merge pull request #5651 from MetaMask/kumavis-patch-3 ... CI - job-publish-release - fix github command	2018-11-03 22:06:17 -04:00
kumavis	14852669ac	Merge pull request #5659 from MetaMask/token-rates-bugfix ... token-rates - protect against bad token data	2018-11-03 21:57:21 -04:00
Thomas Huang	ed4f612bdc	Revert "support eth_chainId"	2018-11-03 14:21:41 -07:00