1065 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	4cf83b582e	Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug	2016-07-12 00:12:44 -07:00
Dan Finlay	947665dca1	Merge pull request #428 from MetaMask/FixSvgIcons ... Fix svg icons	2016-07-11 21:05:18 -07:00
Dan Finlay	57da5a8198	Merge branch 'master' into FixSvgIcons	2016-07-11 20:55:58 -07:00
Dan Finlay	e21a48da83	Linted	2016-07-11 20:53:26 -07:00
Dan Finlay	539fe3e940	Fix svg icon in notification	2016-07-11 20:44:56 -07:00
Dan Finlay	d9718d005c	Merge branch 'master' into FixSvgIcons	2016-07-11 20:44:22 -07:00
Dan Finlay	678f33b06b	Merge pull request #427 from MetaMask/balance-refactor ... Balance refactor, less-than-one abbreviation for eth balances, util cleanup	2016-07-11 20:32:46 -07:00
Kevin Serrano	38225ac8f5	Merge branch 'master' into balance-refactor	2016-07-11 17:54:16 -07:00
Kevin Serrano	a72aad19c8	Update changelog.	2016-07-11 17:45:20 -07:00
Kevin Serrano	d7e6b752a3	Integrate changes back into eth-balance	2016-07-11 17:44:00 -07:00
Kevin Serrano	6a61591dad	Move shorten balance to util. Add as property of generateBalance object output.	2016-07-11 16:31:12 -07:00
Kevin Serrano	37f21cf18f	Remove unused functions. Readd if necessary.	2016-07-11 16:01:52 -07:00
Dan Finlay	45c64a0830	Merge pull request #426 from MetaMask/Version26 ... Version 2.6	2016-07-11 15:57:24 -07:00
Dan Finlay	a446be2397	Version 2.6	2016-07-11 15:54:32 -07:00
Dan Finlay	a5bac9419a	Rebuild states object	2016-07-11 15:49:22 -07:00
Dan Finlay	66e079f1c7	Fix imageification of recipient	2016-07-11 15:49:13 -07:00
Dan Finlay	3274bb78d7	Add coin sending tx state	2016-07-11 15:47:15 -07:00
Dan Finlay	c4a15340e0	Add notification global for development ... The background process now has a global `METAMASK_NOTIFIER` object that allows easy mocking of notification data.	2016-07-11 15:45:57 -07:00
Kevin Serrano	31d0d1ec08	Refactor util tests.	2016-07-11 13:57:47 -07:00
Dan Finlay	791911d6f5	Merge branch 'master' into FixMenuBug	2016-07-11 13:45:19 -07:00
Dan Finlay	8cfa21c1e9	Merge pull request #424 from MetaMask/UpdateScript ... Updated script for what I recorded	2016-07-11 13:44:54 -07:00
Dan Finlay	3c599752d4	Updated script for what I recorded.	2016-07-11 12:06:58 -07:00
Dan Finlay	7b3f0ad43d	Fix main dropdown animation	2016-07-11 11:33:12 -07:00
kumavis	5bb075a278	Merge pull request #418 from MetaMask/ui-fixth-width-tx-history ... Fixed width applied on transaction history components	2016-07-08 21:37:06 -07:00
Kevin Serrano	40d2b7fe71	lint	2016-07-08 17:39:15 -07:00
Kevin Serrano	20bfb60fd2	Implement alternate shortening scheme.	2016-07-08 17:27:13 -07:00
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