7858 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Esteban MIno	dd6a725e6d	unit tests for tokens per account and network	2018-07-27 17:41:47 -04:00
Thomas	d1734b8d7c	Update Phishing Html	2018-07-27 14:10:18 -07:00
Esteban MIno	e687bc5a47	fix migration for preferences controller tokens	2018-07-27 16:17:28 -04:00
Dan Finlay	9dc5d0cee0	Merge pull request #4905 from MetaMask/eip-712-deprecation ... EIP-712: deprecation message	2018-07-27 13:16:44 -07:00
Esteban Miño	228f48c6e5	Merge branch 'develop' into TokensPerAccountBasis	2018-07-27 16:07:08 -04:00
Esteban MIno	5b9725d1f1	refactor to accountTokens	2018-07-27 16:05:12 -04:00
Thomas Huang	1540b5e256	Merge pull request #4893 from kelvintyb/develop ... Move phishing warning to the extension	2018-07-27 12:23:31 -07:00
bitpshr	642ae25073	Add deprecation message for eth_signTypedData	2018-07-27 15:23:05 -04:00
Alexander Tseung	d0c901d081	Round large exponential numbers	2018-07-27 12:22:10 -07:00
Esteban MIno	f5107fa12e	migration for preferences controller tokens	2018-07-27 14:56:03 -04:00
Bruno Barbieri	6d1808d209	Merge pull request #4901 from MetaMask/readme-update ... remove Web Store warning	2018-07-27 13:19:55 -04:00
bobby dresser	308d8ddcba	remove Web Store warning	2018-07-27 09:34:03 -07:00
brunobar79	acfcdf52b4	fix unit tests	2018-07-26 21:52:01 -04:00
brunobar79	4de8f5b0d4	fix dependencies	2018-07-26 21:37:43 -04:00
brunobar79	6886429f0b	fix linting errors	2018-07-26 21:22:39 -04:00
brunobar79	bea1cf3f3c	clean up	2018-07-26 21:15:16 -04:00
brunobar79	d65d018ad0	restore platform/extension.js	2018-07-26 21:11:58 -04:00
brunobar79	69f4c8c336	fix merge conflicts	2018-07-26 21:04:03 -04:00
brunobar79	d4a15f22c2	added webrtc-adapter for browser compat	2018-07-26 21:00:48 -04:00
brunobar79	ea028e7506	fully working without tweaking ext. permission	2018-07-26 20:56:58 -04:00
brunobar79	6cd4bc9f4e	working without permission issues	2018-07-26 20:24:39 -04:00
Esteban MIno	f79a249bcc	modify tests according to tokens by network	2018-07-26 20:04:57 -04:00
Kelvin Tan	a97583b039	revert package-lock.json	2018-07-27 07:50:38 +08:00
Esteban MIno	2827e13caa	add & delete tokens per network	2018-07-26 19:28:12 -04:00
kumavis	e715d0e691	Merge pull request #4858 from MetaMask/chinesesimplifiedandtraditional ... Update Chinese naming on our language list	2018-07-26 15:13:24 -07:00
Esteban MIno	1d3ad7cfbb	tokens per network for individual account	2018-07-26 18:04:34 -04:00
kumavis	ffefeb65d4	Merge pull request #4802 from 03-26/develop ... Update translation 🇯🇵	2018-07-26 14:59:12 -07:00
Kelvin Tan	7ca402147d	add phishing html page, and redirect to bundled page in-window	2018-07-27 00:03:39 +08:00
Thomas	138858647e	Merge branch 'develop' into network-remove-provider-engine	2018-07-25 22:38:44 -07:00
Alexander Tseung	cd2b67cdd9	Fix overflow for long total strings in confirm string	2018-07-25 22:12:13 -07:00
Dan J Miller	53b440a287	Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx ... Only show retry button on the earliest pending tx	2018-07-25 23:42:49 -02:30
Dan J Miller	acddb85f2e	Merge pull request #4876 from MetaMask/i4835-unitTestConfirmDetailRow ... Add tests for Confirm Detail Row	2018-07-25 23:04:44 -02:30
Frankie	b5e3aafe2e	Merge pull request #4871 from MetaMask/3519-new-contract-gas ... tx-gas-utils - catch all errors from gas estimation	2018-07-25 15:33:17 -10:00
Esteban MIno	b580f60d74	earliest tx by submittedTime	2018-07-25 20:58:20 -04:00
Esteban MIno	c8d45cb4a8	only show retry button on earliest pending tx	2018-07-25 20:02:12 -04:00
Sara Reynolds	9934690bd9	lint fix	2018-07-25 16:31:33 -07:00
Sara Reynolds	6eadf5b22b	Update prop names	2018-07-25 16:26:30 -07:00
Esteban MIno	adee549c43	preferences test fixes for tokens per account	2018-07-25 17:46:31 -04:00
Dan Finlay	a5d344a582	Merge pull request #4875 from MetaMask/bmd/readme-release ... add current release to the README	2018-07-25 14:33:33 -07:00
Thomas Huang	bc98085731	Merge pull request #4880 from MetaMask/migration-27 ... migrations - fix to include 27	2018-07-25 14:30:44 -07:00
frankiebee	527b62ee8e	migrations - fix to include 27	2018-07-25 14:11:07 -07:00
Esteban MIno	2770df80e3	add & delete tokens per account	2018-07-25 16:14:10 -04:00
Sara Reynolds	9ca4b66c82	Add tests for Confirm Detail Row	2018-07-25 11:58:51 -07:00
bobby dresser	45379e867d	remove current version	2018-07-25 11:58:27 -07:00
bobby dresser	8cd36c8725	fix link bracket	2018-07-25 11:48:15 -07:00
bobby dresser	87f42468b7	add current release to the README	2018-07-25 10:30:47 -07:00
William Morriss	5782926c28	Merge pull request #4825 from MetaMask/no-inject-ani-gamer ... Do not inject on ani.gamer.com.tw	2018-07-24 19:48:10 -07:00
William Morriss	d57bca9418	Merge pull request #4820 from MetaMask/codeowners ... Added codeowners file	2018-07-24 19:47:53 -07:00
brunobar79	4759915856	fix spinner and qr icon	2018-07-24 22:34:15 -04:00
brunobar79	eeb902dbf0	decent UI	2018-07-24 21:13:17 -04:00