396 Commits

Author	SHA1	Message	Date
Dan Finlay	44545e0f47	Add metamask route to infura urls ... Fixes #597 Allows metamask-specific RPC metrics.	2016-08-31 11:10:25 -07:00
Dan Finlay	fd5dad136f	Remove old notification cleanup code	2016-08-29 17:33:56 -07:00
Dan Finlay	742a0e0dfe	Make popup a type Edge supports	2016-08-29 17:33:35 -07:00
Dan Finlay	1b617402ec	Add extra edge compatibility	2016-08-29 17:33:18 -07:00
Dan Finlay	b36b760338	Fix console.error references ... Microsoft edge does not support console.error.bind, nor is that call necessary here.	2016-08-29 17:32:39 -07:00
Dan Finlay	6838027c65	Remove bind calls from console errors	2016-08-29 16:49:58 -07:00
Dan Finlay	e85418b11a	Merge branch 'master' into EdgeCompatibility	2016-08-29 16:14:51 -07:00
Dan Finlay	bb8241f711	Version 2.10.0	2016-08-29 11:14:18 -07:00
Frankie	547894ed39	Merge branch 'master' into i#563forgotPassword	2016-08-25 16:06:54 -07:00
Dan Finlay	8b81009a30	Merge branch 'master' into PopupNotifications	2016-08-25 15:42:35 -07:00
Frankie	11c6c63d76	Merge branch 'master' into i#563forgotPassword	2016-08-25 14:17:29 -07:00
Frankie	483a7fee0a	Add a back button on lock screen to go back to init menu	2016-08-25 14:13:32 -07:00
Kevin Serrano	a9b390c58c	Bump versioning.	2016-08-24 18:38:15 -07:00
Kevin Serrano	648dd59890	Merge branch 'master' into shortcut-fix	2016-08-24 18:37:01 -07:00
Kevin Serrano	8dfa701197	Fixed prohibited shortcut combination.	2016-08-24 18:33:27 -07:00
Dan Finlay	793ad6b8d8	Merge branch 'master' into PopupNotifications	2016-08-24 16:59:22 -07:00
Dan Finlay	340d12f0cf	Version 2.9.1	2016-08-24 16:32:15 -07:00
Dan Finlay	eee08457e5	Merge branch 'master' into i484PersistPendingSignatures	2016-08-24 16:15:43 -07:00
Dan Finlay	3febbdae57	Linted	2016-08-24 16:02:22 -07:00
Dan Finlay	abb5b2013d	Fix bug where unconfirmed message sig is lost when locked. ... Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message.	2016-08-24 15:58:08 -07:00
Dan Finlay	4e34796983	Merge branch 'master' into PopupNotifications	2016-08-24 15:03:09 -07:00
Kevin Serrano	c82a494b4b	Implement usage of nock.	2016-08-24 13:58:50 -07:00
Kevin Serrano	d3d634d09c	Added mock option to function.	2016-08-24 13:28:06 -07:00
Kevin Serrano	cf5b8ba388	Change shortcut again to Ctrl+Alt+M	2016-08-24 11:15:03 -07:00
Kevin Serrano	1444f5451f	Change shortcut to Alt+M	2016-08-24 10:25:59 -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	671ca33abb	Close notification on opening main UI	2016-08-23 15:44:50 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -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	c97866e367	Merge branch 'master' into kumavis-patch-1	2016-08-22 19:23:01 -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	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	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	6e1000f361	Merge branch 'master' into PopupNotifications	2016-08-22 15:03:36 -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	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Dan Finlay	31e0a3491b	Version 2.9.0	2016-08-22 11:24:34 -07:00
Dan Finlay	7389f9d0a0	Enforce tx history limit	2016-08-18 15:40:56 -07:00
Frankie	3525dc0801	Create a ShapeShift tx in tx History	2016-08-18 15:20:26 -07:00
Frankie	efa61f2cf8	Merge branch 'master' into shapeshiftTx	2016-08-18 11:06:32 -07:00