2799 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	088bfd5e8d	Fix account detail transition fix.	2017-04-05 13:38:33 -07:00
Frankie	dd6b4505f4	Merge pull request #1309 from MetaMask/mascara2 ... Mascara - various fixes	2017-04-05 09:30:07 +02:00
kumavis	1aac162b46	mascara - rename popup to ui	2017-04-04 23:08:46 -07:00
kumavis	0cfad78f5d	mascara - rename things + break out mascara asset server	2017-04-04 22:45:39 -07:00
kumavis	8b14666348	clean - remove unused extension ref	2017-04-04 22:43:55 -07:00
kumavis	9b9570fd2b	auto-faucet - only skip faucet on explicit test environment	2017-04-04 18:48:33 -07:00
kumavis	5a91adf7d8	add platforms to mascara + move buyEther window open to ui	2017-04-04 18:23:46 -07:00
kumavis	5d967eeebb	Merge pull request #1307 from MetaMask/mascara ... Proof of Concept: Mascara	2017-04-04 11:27:45 -07:00
kumavis	4779999bfc	clean - metamask controller - remove log	2017-04-04 11:13:07 -07:00
Kevin Serrano	39181ed33f	Merge pull request #1308 from MetaMask/FixFaucet ... Fix faucet to only autoFaucet first account	2017-04-04 09:43:25 -07:00
Kevin Serrano	953a29b19e	Merge pull request #1306 from MetaMask/redoAutoFaucetAsFetch ... Switch auto-faucet from XMLHttpRequest to fetch	2017-04-04 09:39:56 -07:00
frankiebee	0a7b388b39	Fix faucet to only autoFaucet first account	2017-04-04 18:38:56 +02:00
frankiebee	f80d1ce3e6	Switch auto-faucet from XMLHttpRequest to fetch	2017-04-04 14:55:48 +02:00
frankiebee	5e939540e5	Remove out of date comments	2017-04-04 14:25:52 +02:00
frankiebee	16c24db13b	Fix first install flow	2017-04-04 11:08:10 +02:00
frankiebee	5baa4fd896	Update todos on README	2017-04-03 13:29:19 +02:00
frankiebee	0adbc87316	Update MetaMascara README	2017-04-03 11:34:01 +02:00
frankiebee	57655073f6	Rename mascara root directory	2017-04-03 11:09:03 +02:00
frankiebee	9736e96a93	Check to see if connection is from popup	2017-04-03 11:04:48 +02:00
frankiebee	12065a10aa	Make Popup close after approving a transaction	2017-04-03 11:03:58 +02:00
frankiebee	f81fdbc34f	Merge branch 'master' into mascara	2017-04-02 23:04:55 -07:00
Frankie	235a70b939	Merge pull request #1300 from MetaMask/platform ... Introduce Platform API	2017-04-02 23:04:21 -07:00
frankiebee	89c924101e	Merge branch 'master' into mascara	2017-04-02 22:26:25 -07:00
frankiebee	8d49d519c0	Rename and move around files	2017-04-02 22:01:44 -07:00
kumavis	86e882c51a	notification-manager - rename show -> showPoup + make getPopup private	2017-03-31 18:41:51 -07:00
kumavis	aa06183c64	ui - use global.platform for extension interaction	2017-03-31 18:04:13 -07:00
kumavis	810f5881f6	Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform	2017-03-31 17:57:47 -07:00
kumavis	60a48e713f	ui - move popup auto-close after tx conf to ui entrypoint	2017-03-31 13:32:47 -07:00
kumavis	49d8877fd7	ui - startPopup returns store after boot	2017-03-31 13:20:16 -07:00
kumavis	0ef679388a	ui - reducer - app - code cleanup	2017-03-31 12:38:20 -07:00
Dan Finlay	0a5c634081	Merge pull request #1297 from MetaMask/eip155 ... tx-manager - add eip155 support	2017-03-31 10:33:04 -07:00
Dan Finlay	862973dd67	Merge pull request #1299 from MetaMask/test-notice-fix ... test - fix notice-controller test	2017-03-31 10:20:24 -07:00
kumavis	965c806a45	test - fix notice-controller test	2017-03-30 19:26:01 -07:00
kumavis	bd704b1d7e	etc - fix notification-manager ref, remove duplicated test file	2017-03-30 19:05:11 -07:00
kumavis	f9e09d2300	Merge branch 'master' of github.com:MetaMask/metamask-plugin into platform	2017-03-30 18:55:43 -07:00
Frankie	242ba6e0ec	Merge pull request #1298 from MetaMask/tests-fix ... Test Framework Fix	2017-03-30 18:54:58 -07:00
kumavis	6259ffaef4	extension - remove local extension files, we use extensionizer	2017-03-30 18:35:22 -07:00
kumavis	5036263f88	introduce platform api and rename notifications to notification-manager	2017-03-30 18:33:19 -07:00
kumavis	be88c87b25	extension - prefer extensionizer module	2017-03-30 18:30:24 -07:00
kumavis	12918e1894	tests - tx-manager - fix assert and clean formatting	2017-03-30 16:06:27 -07:00
kumavis	47ea545241	tests - add missing done	2017-03-30 15:43:01 -07:00
kumavis	1079c20c83	meta - package.json - rename npm test scripts	2017-03-30 14:50:01 -07:00
kumavis	8ae37ae80d	tests - helper - add note	2017-03-30 14:49:39 -07:00
kumavis	e95ae43c8f	tests - unit - fail on unhandled promise rejection	2017-03-30 14:43:56 -07:00
kumavis	1dce352523	tx-manager - add eip155 support	2017-03-30 14:23:23 -07:00
frankiebee	29a602a89b	Clean up	2017-03-30 11:28:22 -07:00
Kevin Serrano	738201e8e5	Merge pull request #1288 from MetaMask/i1285-FixFirefoxCurrencyChecks ... Fix currency checking for firefox	2017-03-30 09:31:15 -04:00
Kevin Serrano	9a6b84644a	Merge pull request #1293 from MetaMask/ImproveGasEstimates ... tx-utils - gas buffer ceiling at 90% of block gas limit	2017-03-30 09:25:28 -04:00
kumavis	16b5f4a210	tests - tx-utils gasBuffer calc - fix bug and user easier numbers	2017-03-29 23:59:42 -07:00
kumavis	ff49e5e5cf	tx-utils - gas buffer ceiling at 90% of block gas limit	2017-03-29 23:21:31 -07:00