7903 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
brunobar79	8e842a8947	able to add accounts	2018-08-11 05:02:02 -04:00
brunobar79	78a1cd3314	iframe communication working	2018-08-11 02:35:20 -04:00
brunobar79	5ef80495cf	refactor to support multiple hw wallets	2018-08-10 21:54:34 -04:00
Bruno Barbieri	e2be22a4b7	Merge pull request #4897 from MetaMask/qr-code-scan ... QR Code Scanner	2018-08-10 13:40:06 -04:00
Dan Finlay	ef7e638dda	Merge pull request #5025 from MetaMask/v4.9.2 ... v4.9.2	2018-08-09 15:39:48 -07:00
Thomas Huang	06633da1b3	Merge branch 'master' into v4.9.2	2018-08-09 14:48:28 -07:00
Thomas	a1ced0f197	Bump Changelog	2018-08-09 14:46:47 -07:00
Thomas	b887730be7	v4.9.2	2018-08-09 14:42:34 -07:00
Dan Finlay	be1d5a7dd9	Merge pull request #5020 from MetaMask/FixMigration28 ... Fixes migration 28	2018-08-09 14:24:38 -07:00
Jenny Pollack	0442e5dfd7	Merge pull request #5022 from MetaMask/sentry-release-version ... sentry - change releaseVersion to release	2018-08-09 14:08:47 -07:00
Jenny Pollack	00a2ab21ae	sentry - change releaseVersion to release	2018-08-09 13:49:40 -07:00
Esteban MIno	d263d60b4c	tests for migration 28	2018-08-09 16:41:16 -04:00
Esteban MIno	8df3f2696c	fix migration 28	2018-08-09 16:15:56 -04:00
Dan Finlay	2b25902561	Merge pull request #5017 from MetaMask/v4.9.1 ... V4.9.1	2018-08-09 10:52:11 -07:00
bobby dresser	438fd5bce0	remove duplicate template (#5016)	2018-08-09 10:48:10 -07:00
Thomas	1605c8544a	v4.9.1	2018-08-09 10:23:16 -07:00
Thomas	bbde2ea4fc	Bump Changelog	2018-08-09 10:23:03 -07:00
Thomas	2e82f7e7ba	Merge branch 'develop' of github.com:MetaMask/metamask-extension into develop	2018-08-09 10:10:03 -07:00
Thomas	500ef5cb3a	Merge branch 'master' into develop	2018-08-09 10:09:53 -07:00
bobby dresser	6fb790e9a8	Create issue templates (#4972) ... adds issue templates	2018-08-09 10:09:33 -07:00
Thomas Huang	09b81a2d22	Merge pull request #5010 from eduadiez/develop ... Fix ENS resolution issues	2018-08-09 09:47:25 -07:00
Eduardo Antuña Díez	a2082bae5c	Avoid overwriting a domain that can be resolved by DNS ... According to the current implementation any domain ending in .eth or .test will try to resolve through ENS even if the DNS is able to resolve it. changing `onBeforeRequest` to `onErrorOccurred` will only resolve those .eth or .test domains that the DNS is not able to resolve.	2018-08-09 12:20:51 +02:00
Eduardo Antuña Díez	543207b5af	Fixed ENS to IPFS functionality in Firefox ... `tabs.getSelected` is deprecated and it doesn't work in firefox replaced by `tabs.query({active: true}`	2018-08-09 12:14:09 +02:00
Thomas	de6f8b6811	Delay	2018-08-08 21:06:08 -07:00
Thomas	66120c627f	confirms a deplay contract tx in the popup	2018-08-08 18:04:48 -07:00
Dan J Miller	d4af5b7bec	Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure ... Show error while allowing confirmation of tx where simulation fails	2018-08-08 22:13:41 -02:30
Dan Miller	973325a6c4	Show error while allowing confirmation of transaction where simulation fails	2018-08-08 21:26:25 -02:30
Dan J Miller	1ae668fa5e	Merge pull request #4995 from MetaMask/nonce-for-retry-from-ethquery ... Get nonce for showing retry button using ethQuery transaction count.	2018-08-08 21:09:27 -02:30
Whymarrh Whitby	51644962e9	Fix lint error in tx-list	2018-08-08 19:32:45 -02:30
brunobar79	d0ccc59e45	add comment	2018-08-08 15:42:25 -04:00
brunobar79	656afeefad	fix merge conflicts	2018-08-08 15:40:04 -04:00
Dan Miller	e98c3b4c01	Get nonce for showing retry button using ethQuery transaction count.	2018-08-08 17:04:42 -02:30
Dan J Miller	1d4ee6bf76	Merge pull request #4986 from MetaMask/approve-calc-token-decimals ... Use token decimals when calculating confirm screen token approval amount	2018-08-08 16:26:03 -02:30
Paul Bouchon	8ac4b586eb	Update eth-keyring-controller and eth-hd-keyring versions (#4989)	2018-08-08 13:17:48 -04:00
brunobar79	f269021dc3	add submit button type	2018-08-08 12:22:48 -04:00
Bruno Barbieri	bb52985722	Merge pull request #4988 from MetaMask/remove-engine-restrictions ... Remove engine restrictions	2018-08-08 12:13:45 -04:00
brunobar79	a92e5ec527	remove engine restrictions	2018-08-08 11:46:54 -04:00
Dan Finlay	fdfcc7d687	Merge pull request #4982 from MetaMask/sig-version-fix ... Reestablish old versions of eth-keyring-controller and eth-hd-keyring	2018-08-08 08:26:49 -07:00
Dan Miller	c4f1dfb82e	Use token decimals when calculating confirm screen amount for token approvals.	2018-08-08 12:36:59 -02:30
bitpshr	365e349ec4	Reestablish old versions of eth-keyring-controller and eth-hd-keyring	2018-08-08 08:17:16 -04:00
brunobar79	cbbd0d3c75	lint	2018-08-08 03:21:37 -04:00
brunobar79	a46cf39f9b	update package-lock.json	2018-08-08 03:03:17 -04:00
brunobar79	c6b7e460b5	code review changes	2018-08-08 03:00:39 -04:00
brunobar79	2e0916d8ff	fix merge conflicts	2018-08-08 02:32:35 -04:00
Justin Kat	aab6e366c5	Fixing translations in first-time init menu (#4969)	2018-08-07 23:27:52 -02:30
Esteban MIno	c245405acb	show token address summary on old ui	2018-08-07 20:07:26 -04:00
Esteban MIno	33357e3538	refactor unused code	2018-08-07 19:12:16 -04:00
Esteban MIno	15ea8c04b2	fix merge	2018-08-07 17:53:36 -04:00
Esteban Miño	3f57d5f66b	Merge branch 'develop' into WatchTokenFeature	2018-08-07 17:50:58 -04:00
Esteban MIno	00d1f6fec5	watch token on old ui	2018-08-07 17:40:45 -04:00