1549 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	05b960cace	Merge branch 'master' into tos	2016-09-18 21:10:24 -07:00
Kevin Serrano	262e767f79	Modify terms.	2016-09-18 21:09:34 -07:00
Dan Finlay	57d9481d9d	Bump web3 provider engine version for Parity compliance	2016-09-19 10:17:46 +08:00
Dan Finlay	e197e3808f	Drop origin key from requests for Parity compatibility	2016-09-19 10:16:27 +08:00
Dan Finlay	1f771f30e4	Space out purchase details on ShapeShift form	2016-09-15 21:18:21 -07:00
Dan Finlay	ed51b91b4a	Merge branch 'master' into i675-LoadingBuy	2016-09-15 21:05:24 -07:00
Dan Finlay	ae2f0f585f	Merge pull request #676 from MetaMask/tx-viz ... Add eth-tx-viz link to tx history	2016-09-15 21:04:55 -07:00
Dan Finlay	4eef2c57cf	Show loading indication when selecting ShapeShift	2016-09-15 20:58:18 -07:00
Frankie	77ef71448d	Fix CHANGELOG.md and restructure onClick events	2016-09-15 19:35:04 -07:00
Frankie	3682a2a1f9	linting	2016-09-15 18:25:05 -07:00
Frankie	dcda841f4d	Merge branch 'master' into tx-viz	2016-09-15 18:16:41 -07:00
Frankie	bc33c88ae5	Add to CHANGELOG.md	2016-09-15 18:16:15 -07:00
Frankie	9c982a4bd6	add tx-viz link to transaction history	2016-09-15 18:13:13 -07:00
Dan Finlay	a5e45820cc	Merge pull request #673 from MetaMask/i#519buyButtonTxConf ... Drop the buy button in if tx is more then account balance	2016-09-15 15:00:42 -07:00
Frankie	cf484d735f	Clean up some of the code	2016-09-15 14:31:45 -07:00
kumavis	7293c67f68	bump changelog	2016-09-15 13:22:05 -07:00
kumavis	1325990726	css - smaller balance warning	2016-09-15 13:04:09 -07:00
kumavis	f0d83813d6	confTx - add insufficient balance warning message	2016-09-15 12:56:40 -07:00
kumavis	254dddda97	soften lint warnings	2016-09-15 12:44:47 -07:00
kumavis	5005fc143b	confTx - show disabled accept btn + add colors	2016-09-15 12:42:35 -07:00
Frankie	8ea086290b	Merge branch 'master' into i#519buyButtonTxConf	2016-09-15 10:26:02 -07:00
Frankie	ef0b535d94	Drop the buy button in the confTx view if account does not have enough eth	2016-09-15 10:24:05 -07:00
Frankie	17eb53cfcd	Change Testfaucet url	2016-09-15 10:22:09 -07:00
Dan Finlay	06b9adf172	Merge pull request #671 from MetaMask/UpdateGlobalRefs ... Update global refs	2016-09-14 18:28:47 -07:00
Dan Finlay	cf31e19029	Remove logs	2016-09-14 18:24:52 -07:00
Dan Finlay	2ced4fad5d	Merge branch 'master' into UpdateGlobalRefs	2016-09-14 18:23:42 -07:00
Dan Finlay	0626adc0b4	Merge pull request #669 from MetaMask/Version-2.12.1 ... Version 2.12.1	2016-09-14 18:23:12 -07:00
Kevin Serrano	b0119be9f4	Merge branch 'master' into tos	2016-09-14 16:18:35 -07:00
Kevin Serrano	3270861d62	Modify user agreement	2016-09-14 16:18:07 -07:00
Dan Finlay	f7bd1bb6d8	Merge pull request #669 from MetaMask/Version-2.12.1 ... Version 2.12.1	2016-09-14 15:56:16 -07:00
Dan Finlay	8df005153b	Version 2.12.1	2016-09-14 15:51:50 -07:00
kumavis	d3bd6236a8	Merge pull request #666 from MetaMask/i#626 ... Dont generate a popup notification for transactions from within metmask-extension	2016-09-14 15:14:42 -07:00
Dan Finlay	a0bfdfe409	Do not show user rejection errors within our UI.	2016-09-14 14:34:54 -07:00
Frankie	034742a571	Merge branch 'master' into i#626	2016-09-14 12:42:35 -07:00
Frankie	8e7a9c4709	Remove unused argument	2016-09-14 12:22:39 -07:00
Dan Finlay	b7e6ec5cea	Fix popup flag assignment	2016-09-14 11:57:41 -07:00
Dan Finlay	b2103cbec7	Merge pull request #665 from MetaMask/Version-2.12.0 ... Version 2.12.0	2016-09-14 11:42:09 -07:00
Frankie	cf26523852	Merge branch 'master' into i#626	2016-09-14 11:40:11 -07:00
Dan Finlay	19a354066b	Version 2.12.0	2016-09-14 11:38:59 -07:00
Frankie	17481ff61a	Add to CHANGELOG.md	2016-09-14 11:36:56 -07:00
Dan Finlay	03094091d1	Version 2.11.2	2016-09-14 11:35:50 -07:00
Frankie	eea77b828f	Dont generate a popup notification when submiting a transaction from with in MetaMask	2016-09-14 11:31:59 -07:00
Dan Finlay	440cdf8774	Merge pull request #663 from MetaMask/pe805 ... deps - bump provider-engine 8.0.5	2016-09-14 11:28:42 -07:00
kumavis	f628b0d1f9	deps - bump provider-engine 8.0.5	2016-09-14 11:17:15 -07:00
kumavis	56bdccc76d	Merge pull request #657 from MetaMask/library ... mascara - popup initially working	2016-09-13 15:49:47 -07:00
kumavis	9e2d4d2bc9	Merge branch 'master' into library	2016-09-13 15:39:44 -07:00
kumavis	4b880b87bc	mascara - run background in iframe	2016-09-13 15:27:58 -07:00
Kevin Serrano	d05dfc4eed	Merge pull request #656 from MetaMask/i646-ClosePopupBug ... Fix popup closing bug	2016-09-13 13:14:14 -07:00
Dan Finlay	b624155e60	Merge branch 'i646-ClosePopupBug' of github.com:MetaMask/metamask-plugin into i646-ClosePopupBug	2016-09-13 13:00:29 -07:00
Dan Finlay	3da0d61417	Bump changelog	2016-09-13 12:54:30 -07:00