1091 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Frankie	f80b9b2693	Create a dev state with shapeshift tx	2016-08-18 17:51:38 -07:00
Frankie	98dab0ffd2	Make ballance teal for shapeshift tx and add to change log	2016-08-18 16:30:13 -07:00
Frankie	3525dc0801	Create a ShapeShift tx in tx History	2016-08-18 15:20:26 -07:00
Frankie	23aeb1c5c1	Add api Public key	2016-08-18 12:20:24 -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
Dan Finlay	90d6bec3ed	Merge pull request #520 from MetaMask/usd-conversion ... Conversion implementation	2016-08-16 15:32:06 -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	121af0c4b9	Lint.	2016-08-16 14:51:55 -07:00
Kevin Serrano	5afaebe602	Remove logs.	2016-08-16 14:49:53 -07:00
Kevin Serrano	0b052e94cc	Hide conversions when API fails.	2016-08-16 14:49:21 -07:00
Kevin Serrano	9afa978121	Remove npm debug log.	2016-08-16 14:30:22 -07:00
Kevin Serrano	d43ac808ff	Fix uncalled fn.	2016-08-16 14:28:32 -07:00
Kevin Serrano	7d40f29993	Add to changelog.	2016-08-16 14:13:18 -07:00
Kevin Serrano	3814bf8f5d	Change account list balance rendering.	2016-08-16 14:13:03 -07:00
Kevin Serrano	6cee99f0ba	Remove console logs.	2016-08-16 14:08:14 -07:00
Kevin Serrano	3b27fe1356	Add recent conversion date.	2016-08-16 14:07:42 -07:00
Kevin Serrano	6041ba1ed2	Add fallback to API failure.	2016-08-16 14:07:06 -07:00
Kevin Serrano	da2527ddb4	Remove react-select as dependency.	2016-08-16 13:23:28 -07:00
Kevin Serrano	58e3042a3b	Remove logging. Clean up duplicate entries in currency list.	2016-08-16 13:21:16 -07:00
Kevin Serrano	6e51a5aa75	Add to package request-promise.	2016-08-16 11:26:02 -07:00
Kevin Serrano	7725f38147	Merge branch 'master' into usd-conversion	2016-08-16 10:50:39 -07:00
Kevin Serrano	daba8e87bb	Remove extra test.	2016-08-16 10:50:03 -07:00
Kevin Serrano	7d1b2db87e	linting and ignoring.	2016-08-16 10:48:31 -07:00
Kevin Serrano	009784c79b	Divided eth components for tx and account detail.	2016-08-16 10:34:29 -07:00
Frankie	f1986d7a37	Merge pull request #550 from MetaMask/Version2.8.0 ... Version 2.8.0	2016-08-15 10:58:53 -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	271e3c4fdf	Merge pull request #547 from MetaMask/cssFixes ... Add margin to "go to test faucet" button and show more of the address…	2016-08-14 22:41:23 -07:00
Frankie	2ef4cbaa89	Add margin to "go to test faucet" button and show more of the address on qr code page	2016-08-14 21:41:08 -07:00
kumavis	9b1a3fd7f3	Merge pull request #544 from MetaMask/RemoveEtc ... Remove ethereum classic provider	2016-08-14 18:48:17 -07:00
Dan Finlay	e826eb932c	Remove ethereum classic provider ... Fixes #542	2016-08-14 18:41:05 -07:00
kumavis	f7a5a4e170	Merge pull request #529 from MetaMask/buyForm ... Buy form	2016-08-14 08:18:20 -07:00
Frankie	31d6d5c509	Add to change log	2016-08-13 13:48:49 -07:00
Frankie	99a788a6f0	Add multi message capability to Qr view for market info	2016-08-12 17:43:24 -07:00
Frankie	b72c00a6c1	Add a to test faucet button	2016-08-12 16:12:40 -07:00
Frankie	bf7435926f	Merge branch 'buyForm' of https://github.com/MetaMask/metamask-plugin into buyForm	2016-08-12 15:48:18 -07:00
Frankie	632465b213	Merge branch 'master' into buyForm	2016-08-12 15:47:03 -07:00
Frankie	b4c9a52259	Change buy forms so that they are their own view and add Qr-code	2016-08-12 15:41:59 -07:00
Kevin Serrano	4572e689cf	Merge pull request #538 from MetaMask/i512 ... deps - extracted ensnare to module	2016-08-12 13:29:17 -07:00
kumavis	0b660f4ac8	deps - extracted ensnare to module	2016-08-12 13:25:38 -07:00
kumavis	4f4c78a9fc	Merge pull request #535 from MetaMask/CustomRpcLoadingBug ... Custom rpc loading bug	2016-08-11 20:56:11 -07:00
kumavis	8943e86470	Merge branch 'master' into CustomRpcLoadingBug	2016-08-11 20:53:15 -07:00
kumavis	878a01a294	Merge pull request #532 from MetaMask/logging-fix ... Logging fix	2016-08-11 20:50:01 -07:00
Dan Finlay	a5cfa937ef	Add state selector to mock-dev server used by UI tests	2016-08-11 19:45:47 -07:00
Dan Finlay	f3faec6509	Added buggy state file to states folder	2016-08-11 19:45:20 -07:00
Kevin Serrano	b1f68ec9cd	Add global var for background.	2016-08-11 19:44:59 -07:00
Dan Finlay	20cfd1c9f3	Add network indicator class to loading image	2016-08-11 19:44:41 -07:00
Kevin Serrano	1e54a1b5e8	Merge github.com:MetaMask/metamask-plugin into logging-fix	2016-08-11 19:05:22 -07:00
Kevin Serrano	041538e89e	UI logging supressed for production.	2016-08-11 19:04:50 -07:00