11911 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	1444f5451f	Change shortcut to Alt+M	2016-08-24 10:25:59 -07:00
Kevin Serrano	2a9b271703	Update changelog.	2016-08-23 16:54:25 -07:00
Kevin Serrano	9328e96d80	Add shortcut for opening MetaMask.	2016-08-23 16:53:05 -07:00
Dan Finlay	bc43e3d140	Merge branch 'master' into PopupNotifications	2016-08-23 16:02:06 -07:00
Dan Finlay	a0c7b0b1a2	Merge pull request #574 from MetaMask/fox-sub ... Sub static fox image when WebGL isn't supported	2016-08-23 16:01:36 -07:00
Kevin Serrano	304b5b0b20	Remove gulp dependency.	2016-08-23 15:56:17 -07:00
Dan Finlay	65f7656487	Linted	2016-08-23 15:48:16 -07:00
Dan Finlay	671ca33abb	Close notification on opening main UI	2016-08-23 15:44:50 -07:00
Kevin Serrano	d2c4227a31	Modify package.json.	2016-08-23 15:43:16 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	00e8db31ce	Update package.json	2016-08-23 14:47:37 -07:00
Kevin Serrano	050d0aecc6	Changelog.	2016-08-23 14:32:47 -07:00
Kevin Serrano	6363a80b49	Linting.	2016-08-23 14:32:12 -07:00
Kevin Serrano	5168232481	Created option to pass in static file for fallback for logo.	2016-08-23 14:11:25 -07:00
Dan Finlay	b3887ffd0a	Skip popup dismissal in tests	2016-08-23 11:48:46 -07:00
Dan Finlay	983f3938da	Linted	2016-08-23 11:42:54 -07:00
Dan Finlay	4fb49dfb4b	Close popup even if last tx is dismissed from main UI	2016-08-23 11:40:08 -07:00
Dan Finlay	e5ca83d2bf	Emit updates to all listeners on pending tx updates ... Previously the metamask controller only supported a single UI event listener, which wasn't useful for having a separate notification UI open at the same time. Also reduced the notification's complexity down to a single method, which is heavily re-used. Still has an outstanding bug where if the plugin ui dismisses the last tx, it does not close the notification popup.	2016-08-23 11:15:56 -07:00
Dan Finlay	49ab51d825	Merge branch 'master' into PopupNotifications	2016-08-22 20:06:59 -07:00
kumavis	9dad3a5917	Merge pull request #573 from MetaMask/kumavis-patch-1 ... inpage - cleanContextForImports fix	2016-08-22 19:33:26 -07:00
kumavis	c97866e367	Merge branch 'master' into kumavis-patch-1	2016-08-22 19:23:01 -07:00
kumavis	07927b5798	Merge pull request #558 from MetaMask/i390-TransactionLimit ... Enforce transaction log limit	2016-08-22 19:22:31 -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	f9c58c0746	Merge pull request #572 from MetaMask/i479 ... inpage provider - reassign incomming ids	2016-08-22 19:17:18 -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
Dan Finlay	a0d0245343	Add gulp tasks as npm scripts	2016-08-22 17:37:23 -07:00
Dan Finlay	5d24621b56	More linting	2016-08-22 17:37:16 -07:00
Dan Finlay	a9b53530b6	Fix back button hiding on popup	2016-08-22 17:29:47 -07:00
Dan Finlay	17f3f90d80	Linted	2016-08-22 17:21:54 -07:00
Dan Finlay	75fd650f69	Merge branch 'master' into PopupNotifications	2016-08-22 17:18:53 -07:00
Dan Finlay	361e26fad7	Limit to one popup, re-focus on additional notifications.	2016-08-22 17:18:14 -07:00
Dan Finlay	b79a52c71c	Merge pull request #571 from MetaMask/chinese-local ... Chinese and Spanish localization	2016-08-22 16:43:49 -07:00
Dan Finlay	642e84da6c	Merge master	2016-08-22 15:04:13 -07:00
Dan Finlay	6e1000f361	Merge branch 'master' into PopupNotifications	2016-08-22 15:03:36 -07:00
Dan Finlay	f57cbe59fc	Removed view more button, added account info button. ... Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.	2016-08-22 14:36:21 -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	c223ba2e00	Add builds.zip to gitignore	2016-08-22 11:59:26 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Kevin Serrano	cec88cc9ac	Merge branch 'master' into fox-sub	2016-08-22 11:58:59 -07:00
Dan Finlay	3756384da6	Merge pull request #568 from MetaMask/Version2.9.0 ... Version 2.9.0	2016-08-22 11:28:02 -07:00
Dan Finlay	31e0a3491b	Version 2.9.0	2016-08-22 11:24:34 -07:00
Dan Finlay	a11979968c	Merge pull request #562 from MetaMask/ethBalance ... Fix issue where a given balance does not need to be parsed	2016-08-22 11:08:35 -07:00
Frankie	7e3b0aca62	Add test	2016-08-19 17:30:19 -07:00
Frankie	edfb0eb968	Fix issue where if given a balance that does not need to be parsed will not be parsed	2016-08-19 17:18:11 -07:00
Kevin Serrano	7a466697d3	Modify logic for component update.	2016-08-19 16:59:04 -07:00
Kevin Serrano	43e28788d7	Create replacement logo for non-webgl	2016-08-19 14:47:49 -07:00
Dan Finlay	30af7e96cb	Merge pull request #559 from MetaMask/shapeshiftTx ... Shapeshift tx	2016-08-19 07:57:51 -07:00