359 Commits

Author	SHA1	Message	Date
Kevin Serrano	c82a494b4b	Implement usage of nock.	2016-08-24 13:58:50 -07:00
Kevin Serrano	d3d634d09c	Added mock option to function.	2016-08-24 13:28:06 -07:00
Kevin Serrano	cf5b8ba388	Change shortcut again to Ctrl+Alt+M	2016-08-24 11:15:03 -07:00
Kevin Serrano	1444f5451f	Change shortcut to Alt+M	2016-08-24 10:25:59 -07:00
Kevin Serrano	9328e96d80	Add shortcut for opening MetaMask.	2016-08-23 16:53:05 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	5168232481	Created option to pass in static file for fallback for logo.	2016-08-23 14:11:25 -07:00
kumavis	c97866e367	Merge branch 'master' into kumavis-patch-1	2016-08-22 19:23:01 -07:00
kumavis	8b9999b71e	inpage - cleanContextForImports fix ... set to undefined instead of deleting updates #447	2016-08-22 19:22:12 -07:00
kumavis	5c9ca21ba3	Merge branch 'master' into i390-TransactionLimit	2016-08-22 19:19:53 -07:00
kumavis	2f01ec5be2	Merge branch 'master' into i479	2016-08-22 19:14:58 -07:00
kumavis	b8077983d6	inpage provider - reassign incomming ids	2016-08-22 18:59:15 -07:00
Kevin Serrano	bc2abd0a78	First part of chinese translation.	2016-08-22 14:11:32 -07:00
Kevin Serrano	18aef9570f	Add spanish locales.	2016-08-22 14:07:02 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Dan Finlay	31e0a3491b	Version 2.9.0	2016-08-22 11:24:34 -07:00
Dan Finlay	7389f9d0a0	Enforce tx history limit	2016-08-18 15:40:56 -07:00
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	666f3cd66c	Added compliance for tests and properly accounts for N/A conversions.	2016-08-16 15:11:40 -07:00
Kevin Serrano	d43ac808ff	Fix uncalled fn.	2016-08-16 14:28:32 -07:00
Kevin Serrano	6041ba1ed2	Add fallback to API failure.	2016-08-16 14:07:06 -07:00
Kevin Serrano	58e3042a3b	Remove logging. Clean up duplicate entries in currency list.	2016-08-16 13:21:16 -07:00
Kevin Serrano	7725f38147	Merge branch 'master' into usd-conversion	2016-08-16 10:50:39 -07:00
Dan Finlay	e5f2c1a866	Version 2.8.0	2016-08-15 10:56:01 -07:00
Kevin Serrano	6895d330ff	Merge master.	2016-08-15 10:50:53 -07:00
Dan Finlay	e826eb932c	Remove ethereum classic provider ... Fixes #542	2016-08-14 18:41:05 -07:00
kumavis	0b660f4ac8	deps - extracted ensnare to module	2016-08-12 13:25:38 -07:00
Kevin Serrano	b1f68ec9cd	Add global var for background.	2016-08-11 19:44:59 -07:00
Kevin Serrano	1e54a1b5e8	Merge github.com:MetaMask/metamask-plugin into logging-fix	2016-08-11 19:05:22 -07:00
Kevin Serrano	2b0c6953e2	Create global variable that changes ui logging.	2016-08-11 18:58:23 -07:00
Kevin Serrano	b8856d765d	Setting defaults to production.	2016-08-11 15:42:21 -07:00
kumavis	c0f7c49105	inpage-prov - sync error - fix link	2016-08-11 14:35:55 -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
kumavis	d7dffedf48	deps - local-message-stream extracted as module post-message-stream	2016-08-11 14:04:20 -07:00
Kevin Serrano	804e8df87f	Lint	2016-08-11 14:03:51 -07:00
Kevin Serrano	9904b4ef5a	Add ability to hide logging messages in production.	2016-08-11 13:59:14 -07:00
kumavis	53b1334d37	clean -formatting	2016-08-11 13:31:00 -07:00
kumavis	3417c421c8	inpage-provider - remove createSyncProvider, just fail	2016-08-11 13:23:49 -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	8acb3e6007	Enable full listing of supported currencies by Cryptonator.	2016-08-09 09:48:08 -07:00
Kevin Serrano	260de6532c	Get fiat numbers rendering on tooltip. Need to find way to create line breaks.	2016-08-05 12:18:44 -07:00
Kevin Serrano	479abadaa7	Merge branch 'master' into usd-conversion	2016-08-04 13:26:03 -07:00
Dan Finlay	f9e81bdd99	Version 2.7.3	2016-07-29 13:28:26 -07:00
Dan Finlay	c9c8fbf2ec	Fix account selection updating	2016-07-29 13:27:39 -07:00
Dan Finlay	019581bd1f	Version 2.7.2	2016-07-29 13:08:57 -07:00