839 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	58ee3e1227	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-width-tx-history	2016-07-07 17:39:48 -07:00
kumavis	6d44eaefcb	Merge pull request #419 from MetaMask/ConfirmationStyle ... Tx Confirmation - fixes	2016-07-07 17:36:28 -07:00
kumavis	d2eab80e09	eth-balance fix	2016-07-07 17:34:30 -07:00
kumavis	501ffba6f2	lint - dingle dangle comma tangle	2016-07-07 17:00:24 -07:00
kumavis	03430e8473	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 16:56:20 -07:00
kumavis	7dc67a9257	notif - add support for forward carrat	2016-07-07 16:54:35 -07:00
Kevin Serrano	86b7cc6637	Resolve merge conflict.	2016-07-07 16:33:06 -07:00
Kevin Serrano	9a9c1f2cd4	Pass the linters.	2016-07-07 16:30:52 -07:00
Kevin Serrano	1c1d6241ed	Remove reducer console log.	2016-07-07 16:29:31 -07:00
Kevin Serrano	f26c47a3fc	Modify changelog.	2016-07-07 16:28:40 -07:00
Kevin Serrano	5343404d0d	Add new component for tx-history to avoid messing with other styles. Add fixed width specifically to this style.	2016-07-07 16:27:37 -07:00
Kevin Serrano	570d560932	Modified test views again. Added fixed length to center tx information.	2016-07-07 15:39:19 -07:00
Dan Finlay	44a45f38be	Merge pull request #417 from MetaMask/FixEthBalanceStyle ... Fixed eth_balance style, completing partial merge	2016-07-07 15:31:21 -07:00
kumavis	11fd281a33	ui - remove doubled eth-balance	2016-07-07 15:29:46 -07:00
Dan Finlay	33150cc721	Fixed eth_balance style, completing partial merge	2016-07-07 15:22:10 -07:00
Dan Finlay	2bd31c3e50	Merge pull request #406 from MetaMask/ConfirmationStyle ... Update transaction confirmation style	2016-07-07 15:11:21 -07:00
kumavis	ac808e681f	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 15:04:53 -07:00
Kevin Serrano	ef8b6519b7	Merge branch 'master' into ui-fixth-width-tx-history	2016-07-07 14:49:46 -07:00
Kevin Serrano	94c25ec26a	Modify development states to account for long domains.	2016-07-07 14:48:54 -07:00
Dan Finlay	3fb36b2dd3	Merge pull request #413 from MetaMask/ui-fix ... Add new test state with tx history. Fix alignment issue with transact…	2016-07-07 14:17:03 -07:00
Kevin Serrano	432221625c	Remove logging for states.	2016-07-07 13:50:57 -07:00
Kevin Serrano	ecb0f9767b	Add new test state with tx history. Fix alignment issue with transaction history text.	2016-07-07 13:48:52 -07:00
kumavis	f71956b2ab	lint fix	2016-07-07 13:45:06 -07:00
kumavis	0bb8b8cacc	Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle	2016-07-07 13:41:32 -07:00
Dan Finlay	3cd502a163	Restore button naming consistency	2016-07-07 13:22:38 -07:00
Dan Finlay	e8efe84320	Add nickname rendering for recipient address	2016-07-07 13:21:45 -07:00
Dan Finlay	5a99d2a77c	Merge pull request #412 from MetaMask/ethBalance ... Add method to deal with small decimals	2016-07-07 12:42:31 -07:00
Dan Finlay	306035f575	Linted	2016-07-07 12:41:07 -07:00
Dan Finlay	468c1ffa42	Refined tx confirmation button styles	2016-07-07 12:39:40 -07:00
Frankie	cd8ae4b5ff	Change function name to generateBalanceObject	2016-07-07 12:39:07 -07:00
Dan Finlay	2a204624f5	Implement tx confirmation style refinements	2016-07-07 12:27:34 -07:00
Dan Finlay	97b60caac0	Add configurable params to eth-balance	2016-07-07 12:27:18 -07:00
Frankie	0a6560bd5d	Add method to deal with small decimals and create the object for eth-balance component	2016-07-07 12:13:38 -07:00
Dan Finlay	1e92e7e9d4	Make mini account panel labels fully configurable	2016-07-07 11:50:01 -07:00
Dan Finlay	21f17214be	Remove formatBalance.formatted references	2016-07-07 11:39:24 -07:00
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