2912 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
frankiebee	e7e0919d7c	Setup test enviroment for mascara	2017-04-28 14:11:05 +02:00
Thomas Huang	6f17c996c2	Merge pull request #1343 from MetaMask/Version-3.5.4 ... Version 3.6.0	2017-04-27 15:38:51 -07:00
Dan Finlay	6d1fe7845c	Version 3.6.0 ... t # Explicit paths specified without -i or -o; assuming --only paths...	2017-04-27 15:11:14 -07:00
Dan Finlay	a9a39bdf8f	Merge branch 'master' into Version-3.5.4	2017-04-27 15:10:16 -07:00
Thomas Huang	d8a5e6a8e4	Merge pull request #1352 from MetaMask/rinkeby ... Rinkeby	2017-04-27 15:08:13 -07:00
Dan Finlay	d1a1069180	Merge branch 'master' into rinkeby	2017-04-27 14:50:19 -07:00
Dan Finlay	a90b010de8	Merge pull request #1351 from MetaMask/lint ... Fix linting warnings	2017-04-27 14:48:13 -07:00
Dan Finlay	72cb49511f	Merge pull request #1347 from MetaMask/gulp-fail-fix ... build - make gulp return non-zero error code on bundle fail	2017-04-27 14:47:38 -07:00
Dan Finlay	4275d44019	Merge pull request #1345 from MetaMask/docker-node7 ... mascara - docker - bump to node7	2017-04-27 14:46:42 -07:00
frankiebee	e7c7c85791	Update README for mascara	2017-04-27 14:27:47 +02:00
frankiebee	e665dd7e1c	bump client-sw-ready-event	2017-04-27 13:31:54 +02:00
Thomas Huang	6bdb4c8728	Fix linting warnings	2017-04-26 21:05:45 -07:00
Kevin Serrano	b0919ba729	Add to changelog.	2017-04-25 14:57:35 -07:00
Kevin Serrano	09034772d0	Add (vague) instructions to adding a new network to the dropdown.	2017-04-25 14:57:07 -07:00
Kevin Serrano	f2bf7326cc	Linting.	2017-04-25 14:44:25 -07:00
Kevin Serrano	242dc1e99f	Add missing changes. Create unique style for rinkeby icon.	2017-04-25 14:39:01 -07:00
kumavis	4d42cfaa25	build - make gulp return non-zero error code on bundle fail	2017-04-25 14:04:51 -07:00
Nickyg	d764e46a50	change network name to rinkeby when selected	2017-04-26 02:15:15 +05:30
Nickyg	e9aa37b699	add rinkeby network	2017-04-26 01:40:33 +05:30
kumavis	e45d5c858e	mascara - docker - bump to node7	2017-04-25 12:49:24 -07:00
Dan Finlay	f1beb0720a	Version 3.5.4	2017-04-25 10:59:43 -07:00
kumavis	afbe6f5e5f	Merge pull request #1342 from MetaMask/AllowBigSignatureV ... Allow signature V values over 1 byte	2017-04-25 10:51:06 -07:00
Dan Finlay	04e489f4df	Allow signature V values over 1 byte ... By bumping ethereumjs-tx.	2017-04-25 10:20:49 -07:00
Kevin Serrano	72658258b6	Merge pull request #1339 from MetaMask/BumpProviderEngine ... Bump provider engine	2017-04-24 21:46:17 -07:00
Dan Finlay	292e2dca83	Bump provider-engine	2017-04-24 20:59:59 -07:00
Dan Finlay	3ae2a82995	Bump provider engine ... Should now pass test suite, and include several sweet recent fixes!	2017-04-24 18:49:23 -07:00
kumavis	47f3e242e3	Merge pull request #1338 from MetaMask/Version-3.5.3 ... Version 3.5.3	2017-04-24 14:18:57 -07:00
Dan Finlay	c3746e62ec	Version 3.5.3	2017-04-24 13:58:46 -07:00
Dan Finlay	ca3faba1ac	Merge pull request #1336 from MetaMask/buyButtonRedo ... Buy button redo	2017-04-24 13:53:35 -07:00
frankiebee	79f88398ac	fix spelling	2017-04-24 20:56:31 +02:00
Dan Finlay	8d42037652	Merge pull request #1331 from MetaMask/i1323-kovanNoticeRemoval ... Kovan notice removal	2017-04-24 11:25:11 -07:00
frankiebee	df9e40be63	Css fixes	2017-04-24 12:58:01 +02:00
frankiebee	9ebc5ed33c	make buy button green	2017-04-24 12:36:17 +02:00
frankiebee	1eda55c85a	Fix issue where stopPropagation didnt stop submitting the tx when clicking buy button	2017-04-24 12:35:45 +02:00
Frankie	2e75011778	Merge pull request #1335 from MetaMask/buyButtonRedoCleanUp ... Buy button redo clean up	2017-04-24 12:14:43 +02:00
Jared Pereira	7f12be6a01	remove updateCoinBaseAmount action	2017-04-24 12:18:54 +04:00
Jared Pereira	5cabd3e02d	remove updateBuyAddress action	2017-04-23 21:45:55 +04:00
Jared Pereira	c1df7dedd9	remove case buyForm	2017-04-23 16:21:04 +04:00
Jared Pereira	7a8496f9da	remove buyButtonDeligator function	2017-04-23 15:28:45 +04:00
Jared Pereira	e543050868	remove extra buyAddress in state	2017-04-23 15:27:17 +04:00
kumavis	46677427b4	Merge pull request #1333 from MetaMask/firefoxIDB ... Fix for Firefox idb	2017-04-21 14:51:02 -07:00
frankiebee	1b19b51e08	Clean up code	2017-04-21 23:11:54 +02:00
frankiebee	437c4acc9f	Reduce wakeup time for firefox	2017-04-21 17:58:18 +02:00
frankiebee	4a4a737360	Fix for firefox	2017-04-21 17:56:14 +02:00
frankiebee	ce03b7db51	Initial redo attempt of the buy view to look like vladt's desighn	2017-04-18 23:22:17 +02:00
frankiebee	83811910c8	Create a custom radio list component	2017-04-18 18:20:31 +02:00
Kevin Serrano	2920faf63c	Add more detailed instructions on generating and deleting notices.	2017-04-17 13:45:49 -07:00
Kevin Serrano	94984437db	Remove kovan notice.	2017-04-17 13:05:40 -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