33 Commits

Author	SHA1	Message	Date
Frankie	3525dc0801	Create a ShapeShift tx in tx History	2016-08-18 15:20:26 -07:00
Frankie	efa61f2cf8	Merge branch 'master' into shapeshiftTx	2016-08-18 11:06:32 -07:00
Frankie	752d16f6c0	WIP: ShapeShift tx	2016-08-18 11:04:28 -07:00
Kevin Serrano	d43ac808ff	Fix uncalled fn.	2016-08-16 14:28:32 -07:00
Kevin Serrano	58e3042a3b	Remove logging. Clean up duplicate entries in currency list.	2016-08-16 13:21:16 -07:00
Kevin Serrano	6895d330ff	Merge master.	2016-08-15 10:50:53 -07:00
Kevin Serrano	b1f68ec9cd	Add global var for background.	2016-08-11 19:44:59 -07:00
Kevin Serrano	2b0c6953e2	Create global variable that changes ui logging.	2016-08-11 18:58:23 -07:00
Kevin Serrano	243d83dd33	Separate developmentMode conditional to only wrap log.	2016-08-11 14:24:35 -07:00
Kevin Serrano	ad468c1880	Merge branch 'master' into logging-fix	2016-08-11 14:07:49 -07:00
Kevin Serrano	9904b4ef5a	Add ability to hide logging messages in production.	2016-08-11 13:59:14 -07:00
Kevin Serrano	abfc5632ef	Fix ether warning checkbox.	2016-08-10 10:54:55 -07:00
Kevin Serrano	cb0c1f25ba	Did not previously call functions before!	2016-08-09 16:49:15 -07:00
Kevin Serrano	637d3978b7	Fix default value. Add loading indication for async.	2016-08-09 16:33:58 -07:00
Kevin Serrano	479abadaa7	Merge branch 'master' into usd-conversion	2016-08-04 13:26:03 -07:00
Dan Finlay	c9c8fbf2ec	Fix account selection updating	2016-07-29 13:27:39 -07:00
Kevin Serrano	86832e6feb	Fix merge conflicts. Fix typos. Ensure currency immediately updated on load.	2016-07-22 11:15:47 -07:00
Kevin Serrano	22528002e1	Linting!	2016-07-22 10:15:39 -07:00
Kevin Serrano	a612fcee64	Change function names. Add interval polling for api. Refactor functions.	2016-07-21 16:44:50 -07:00
Kevin Serrano	716e65424d	Add date access throughout the data flow.	2016-07-21 14:08:26 -07:00
Frankie	fcd523abe4	Buy button (#474) ... * WIP: Buy button link * Add buy eth and the buy eth warning message * Add css * Move the opening of coinbase page to background and send to faucet if on test net * Create a Warning about storeing eth * Finish Buy button and Eth store warning screen * Add to CHANGELOG * fix frankies deletion and change chrome to extension	2016-07-21 13:41:10 -07:00
Kevin Serrano	7b85802a0f	Merge branch 'master' into usd-conversion	2016-07-21 11:30:57 -07:00
Dan Finlay	6658bea8d4	Implement some cross-browser practices (#473) ... * Add mozilla plugin key to manifest * Move all chrome references into platform-checking module Addresses #453 * Add chrome global back to linter blacklist * Add tests	2016-07-21 10:45:32 -07:00
Kevin Serrano	4a9d5b1c25	Add data field to pass up parameters up to reducer.	2016-07-21 10:15:34 -07:00
Kevin Serrano	491b9cddc5	Add fiat actions to metamask controllere and actions.	2016-07-21 09:30:58 -07:00
Dan Finlay	9609593f13	Fix bug where rejected tx would not call back	2016-07-07 11:00:19 -07:00
Dan Finlay	c0b0c9c028	Simplify error log	2016-07-05 09:51:33 -07:00
Dan Finlay	1d8d7d833d	Improve metamask-controller error logging ... Fixes #384	2016-07-05 09:06:33 -07:00
kumavis	cc970ccd0d	fix typo	2016-06-30 15:31:36 -07:00
Dan Finlay	60fec24c00	Debugged by using a real dapp	2016-06-24 17:00:35 -07:00
Dan Finlay	d3e0e7fe45	Manually debugged refactor	2016-06-24 16:46:18 -07:00
Dan Finlay	122018a96a	Fixed tests	2016-06-24 16:13:27 -07:00
Dan Finlay	fa7e466559	Rename background-controller metamask-controller	2016-06-24 15:55:11 -07:00