2817 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	40e2450022	Get token list looking ok	2017-04-21 09:01:51 -07:00
Dan Finlay	7202639b37	Add token-list dev state	2017-04-21 09:01:38 -07:00
Dan Finlay	9bae32e78b	Add functional but ugly and hard-coded token list	2017-04-20 19:10:22 -07:00
kumavis	d7d13caf05	Merge pull request #1313 from MetaMask/wakeUp2 ... Wake up2	2017-04-06 13:02:32 -07:00
frankiebee	65979ba86e	fix syntax	2017-04-06 21:57:02 +02:00
frankiebee	c46f9a7105	uncomment intervalDelay	2017-04-06 21:55:36 +02:00
frankiebee	e9a223931a	match intervals	2017-04-06 21:51:42 +02:00
frankiebee	a1c39006de	Fix wakeUps: ... fix spelling cut wakeup time in half	2017-04-06 21:48:51 +02:00
kumavis	313d02f2de	Merge pull request #1312 from MetaMask/WakeUp ... Wake up	2017-04-06 10:38:12 -07:00
frankiebee	94df168113	Bump sw-client version	2017-04-06 19:32:45 +02:00
frankiebee	478a07ea81	remove unnecessary listner	2017-04-06 18:58:41 +02:00
frankiebee	719d0f4ad5	Ping service worker to keep it from going idle	2017-04-06 18:56:13 +02:00
Frankie	4a42ac86a0	Merge pull request #1311 from MetaMask/mascara-publish ... Mascara - docker support	2017-04-06 09:37:52 +02:00
kumavis	4b8324620e	mascara - ready to deploy via docker	2017-04-05 22:59:25 -07:00
kumavis	b922303223	Merge pull request #1310 from MetaMask/account-transition-fix ... Account transition fix	2017-04-05 21:43:58 -07:00
Kevin Serrano	ddbbc645d3	Changelog.	2017-04-05 13:39:49 -07:00
Kevin Serrano	088bfd5e8d	Fix account detail transition fix.	2017-04-05 13:38:33 -07:00
kumavis	a6c6ecf275	mascara - mascara lib - read mascara origin from env var	2017-04-05 10:27:04 -07:00
kumavis	c1e14cd75b	build - add envify to bundle process	2017-04-05 10:24:30 -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