2478 Commits

Author	SHA1	Message	Date
brunobar79	992e7f1b5a	fix merge conflicts	2018-08-17 12:56:07 -04:00
brunobar79	285814646f	ui ready	2018-08-16 20:41:23 -04:00
brunobar79	2ea05e303d	connect screen ready	2018-08-16 19:39:52 -04:00
brunobar79	837be704f5	change Metamask for MetaMask	2018-08-15 11:44:00 -04:00
Bruno Barbieri	80fe3ce888	Merge branch 'develop' into ledger-support	2018-08-14 22:55:47 -04:00
brunobar79	82a5ed1e03	remove console logs	2018-08-14 22:40:29 -04:00
brunobar79	fdf202efb0	fixed unit tests	2018-08-14 21:19:01 -04:00
brunobar79	c72ced79ae	ui fixes	2018-08-14 19:22:00 -04:00
brunobar79	b77cc3d969	fix tx tests	2018-08-14 03:42:23 -04:00
brunobar79	61a279204a	legacy and new hd path working	2018-08-14 01:26:18 -04:00
brunobar79	4e1d8ba19d	good progress adding paths	2018-08-13 19:29:43 -04:00
Whymarrh Whitby	6e6a4825ac	Fix casing of Bitcoin, Ethereum, and Litecoin across localized messages ... Using the following commands: sed -i.bak s/bitcoin/Bitcoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/ethereum/Ethereum/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete sed -i.bak s/litecoin/Litecoin/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete	2018-08-13 19:47:56 -02:30
Whymarrh Whitby	6c11ae44bf	Fix casing of MetaMask in all localized messages ... Using the following: sed -i.bak s/Metamask/MetaMask/ app/_locales/**/*.json && \ find app/_locales/ -name '*.bak' -delete	2018-08-13 19:47:45 -02:30
brunobar79	8f9a0a535c	clean up	2018-08-12 01:43:41 -04:00
brunobar79	0b9b892c6b	this should be ready to go	2018-08-12 01:34:01 -04:00
brunobar79	2355573340	clean up	2018-08-12 00:06:36 -04:00
brunobar79	e6d64cecf8	message signing works	2018-08-11 20:26:34 -04:00
brunobar79	068bf43615	working	2018-08-11 19:27:24 -04:00
brunobar79	12b41b8fc2	tx signature is valid	2018-08-11 18:20:50 -04:00
brunobar79	011cc141b3	tx signing should work	2018-08-11 16:00:29 -04:00
brunobar79	aa6a42e3de	rename keyring	2018-08-11 05:11:21 -04:00
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	be1d5a7dd9	Merge pull request #5020 from MetaMask/FixMigration28 ... Fixes migration 28	2018-08-09 14:24:38 -07:00
Jenny Pollack	00a2ab21ae	sentry - change releaseVersion to release	2018-08-09 13:49:40 -07:00
Esteban MIno	8df3f2696c	fix migration 28	2018-08-09 16:15:56 -04:00
Thomas	1605c8544a	v4.9.1	2018-08-09 10:23:16 -07:00
Thomas	500ef5cb3a	Merge branch 'master' into develop	2018-08-09 10:09:53 -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
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
Esteban MIno	c0cdda8321	Merge branch 'develop' into TokensPerAccountBasis	2018-08-07 14:17:40 -04:00
Whymarrh Whitby	d0611741a2	Show invalid seed phrase error when importing new account	2018-08-07 02:09:26 -02:30
brunobar79	71ef4d85da	design complete	2018-08-03 18:57:23 -04:00
brunobar79	710b4e294f	added crossbrowser support and error handling	2018-07-31 18:30:56 -04:00
Esteban MIno	d8817b2646	fix doc tag	2018-07-31 16:18:06 -04:00
Esteban MIno	3124e8c612	tokens related functions refactor	2018-07-31 15:59:19 -04:00
Esteban MIno	ccae79d392	fix undefined for tokens on tests	2018-07-31 13:07:28 -04:00
brunobar79	edb154749d	send to fullscreen if no permission from popup	2018-07-30 22:57:05 -04:00
Esteban MIno	22cf5a1391	improve comments	2018-07-30 20:44:22 -04:00
Esteban MIno	822c1734d6	fix double state update when account changed	2018-07-30 20:36:31 -04:00
Esteban MIno	fbcba8f019	create tokens storage when setadresses	2018-07-30 19:09:17 -04:00
Esteban MIno	31286673c3	isolation of tokens related methods in preferences	2018-07-30 18:43:34 -04:00
brunobar79	34617a21c3	copy	2018-07-30 18:36:37 -04:00
brunobar79	4339f04e80	use existing modals	2018-07-30 17:50:05 -04:00
Esteban MIno	0757f47e84	passing tokens to all accounts in migration	2018-07-30 11:41:31 -04:00
Thomas	d1734b8d7c	Update Phishing Html	2018-07-27 14:10:18 -07:00