6304 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	a02f43fb7f	Merge branch 'master' into ConfirmationStyle	2016-07-07 11:38:11 -07:00
Dan Finlay	bbc7d222d8	Merge pull request #410 from MetaMask/cleanupEthbug ... Revert back to original formatBalance	2016-07-07 11:35:53 -07:00
Frankie	2cc44df584	Revert back to original formatBalance	2016-07-07 11:20:02 -07:00
kumavis	768b049696	Merge pull request #408 from MetaMask/FixNoDeclineCallback ... Fix bug where rejected tx would not call back	2016-07-07 11:13:14 -07:00
Dan Finlay	9609593f13	Fix bug where rejected tx would not call back	2016-07-07 11:00:19 -07:00
Dan Finlay	ec7dfe9f11	Merge branch 'ConfirmationStyle' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-06 23:38:56 -07:00
Dan Finlay	c2655bef5a	Correct data length calculation	2016-07-06 23:38:07 -07:00
Dan Finlay	c59f75aeb5	Correct data length calculation	2016-07-06 23:35:59 -07:00
Dan Finlay	5faa64817c	Update gas cost	2016-07-06 23:16:04 -07:00
Dan Finlay	3bcf44509e	Fix sender balance rendering in pending tx details	2016-07-06 23:11:47 -07:00
Dan Finlay	edf681a1e8	Simplify ui dev mode style	2016-07-06 23:05:30 -07:00
Dan Finlay	28617d8710	Bump changelog	2016-07-06 22:57:00 -07:00
Dan Finlay	a1fdf28a7b	Merge branch 'master' into ConfirmationStyle	2016-07-06 22:56:07 -07:00
Dan Finlay	9e0d9b88cc	Linted	2016-07-06 22:51:28 -07:00
Dan Finlay	ce463f3aff	Fixed up pending-tx-details	2016-07-06 22:48:02 -07:00
kumavis	ecfe720b8b	Merge pull request #404 from MetaMask/fastinject ... contentscript - remove timeout before stream setup	2016-07-06 22:03:08 -07:00
kumavis	786a283dd2	contentscript - remove timeout before stream setup	2016-07-06 21:45:15 -07:00
Dan Finlay	7481f7c3df	Fleshed out pending tx view	2016-07-06 21:32:36 -07:00
kumavis	e885c3ba09	Merge pull request #403 from MetaMask/fastinject ... Improve web3 injection times	2016-07-06 20:56:45 -07:00
kumavis	d892fffce2	Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject	2016-07-06 20:52:28 -07:00
kumavis	5c4c902c94	appease the linting gods	2016-07-06 20:32:36 -07:00
Dan Finlay	a038eed6e3	Merge pull request #402 from MetaMask/z-position-fix ... Fix dropdown z-index issue.	2016-07-06 20:24:28 -07:00
kumavis	ec5adf014e	changelog - add web3 min dist	2016-07-06 20:22:20 -07:00
kumavis	2f33c0a019	Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject	2016-07-06 20:21:09 -07:00
kumavis	7aa120e630	web3 injection - use web3 dist for faster injection	2016-07-06 20:20:40 -07:00
Kevin Serrano	acdd40e3be	Fix dropdown z-index issue.	2016-07-06 20:11:49 -07:00
Dan Finlay	fb363b8a62	Merge pull request #401 from MetaMask/ethBalance ... Handle to small of balances with "<0.00001"	2016-07-06 20:05:44 -07:00
Frankie	8834548b01	Handle to small of balances with "<0.00001"	2016-07-06 19:17:32 -07:00
Dan Finlay	689bd58d81	Merged latest balance formatting code	2016-07-06 18:06:28 -07:00
Dan Finlay	525abb85d4	Merge pull request #399 from MetaMask/ethBalance ... Eth balance	2016-07-06 18:01:22 -07:00
Dan Finlay	15afbe5b1f	Merge branch 'master' into ConfirmationStyle	2016-07-06 17:59:00 -07:00
Dan Finlay	7058dc4ee3	Began reworking tx conf view	2016-07-06 17:58:46 -07:00
Frankie	53eefc1efc	Add a postion option for tool tip	2016-07-06 17:12:33 -07:00
Frankie	9d577ea023	Add decimal hendeling to ETH balance	2016-07-06 17:04:09 -07:00
Kevin Serrano	9d54f10dc5	Merge pull request #392 from MetaMask/kumavis-patch-1 ... readme - camel case MetaMask	2016-07-06 11:08:00 -07:00
kumavis	39175ba837	readme - camel case MetaMask	2016-07-06 11:04:26 -07:00
Dan Finlay	fb5dbd23a9	Merge pull request #387 from MetaMask/ui-formatting ... Ui formatting for account details	2016-07-06 11:00:32 -07:00
Dan Finlay	dd9957d2b2	Merge pull request #388 from MetaMask/script-edits ... Edits to the video script	2016-07-05 16:22:32 -07:00
Dan Finlay	61f2e265c0	Merge pull request #389 from MetaMask/thinFont ... Thin font	2016-07-05 16:17:50 -07:00
Frankie	1f1737a63e	Merge branch 'master' into thinFont	2016-07-05 15:40:42 -07:00
Frankie	8d67a820a9	Add light and ultraLight fonts	2016-07-05 15:39:51 -07:00
Kevin Serrano	5c703deb2c	Edits to the script ya know.	2016-07-05 15:33:32 -07:00
Dan Finlay	2c89cd722e	Simplify empty account balance rendering	2016-07-05 15:16:40 -07:00
Dan Finlay	25598f1b6f	Merge pull request #385 from MetaMask/ImprovedLogging ... Improve metamask-controller error logging	2016-07-05 12:33:21 -07:00
Kevin Serrano	04c4dad890	Add to changelog.	2016-07-05 12:08:08 -07:00
Kevin Serrano	3ca20bd8a3	Move account balance down a row. Adjusted positioning of buttons.	2016-07-05 12:04:15 -07:00
Dan Finlay	c4cbe3ad4c	Add video script draft	2016-07-05 11:52:38 -07:00
Dan Finlay	977e8611d6	Add state list rebuilding on ui task	2016-07-05 11:15:30 -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