271 Commits

Author	SHA1	Message	Date
Dan Finlay	a02f43fb7f	Merge branch 'master' into ConfirmationStyle	2016-07-07 11:38:11 -07:00
Dan Finlay	9609593f13	Fix bug where rejected tx would not call back	2016-07-07 11:00:19 -07:00
Dan Finlay	a1fdf28a7b	Merge branch 'master' into ConfirmationStyle	2016-07-06 22:56:07 -07:00
kumavis	786a283dd2	contentscript - remove timeout before stream setup	2016-07-06 21:45:15 -07:00
kumavis	5c4c902c94	appease the linting gods	2016-07-06 20:32:36 -07:00
kumavis	7aa120e630	web3 injection - use web3 dist for faster injection	2016-07-06 20:20:40 -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	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
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
Dan Finlay	76c473538a	Version 2.5.0	2016-07-01 20:15:27 -07:00
kumavis	d4e400e5e5	Merge pull request #378 from MetaMask/UiDev ... Ui dev	2016-06-30 21:20:40 -07:00
Dan Finlay	e55938ed15	First simple version of ui mocker	2016-06-30 18:22:16 -07:00
kumavis	cc970ccd0d	fix typo	2016-06-30 15:31:36 -07:00
Dan Finlay	78f2794d39	Remove useless and buggy clearWallet function	2016-06-30 11:34:34 -07:00
Dan Finlay	6fef01c8a1	Emphasizing how weird this bug is by removing all behavior from the method.	2016-06-30 11:31:27 -07:00
Dan Finlay	f49b6ca1dc	Replicated really strange bug with test	2016-06-30 11:30:46 -07:00
Kevin Serrano	3ae479f5ac	Unify wording for transaction options (#369) ... * Unify wording for transaction options. * Modify changelog. * Fix wording and spacing.	2016-06-29 15:44:37 -07:00
Dan Finlay	757a3ce6be	Version 2.4.5	2016-06-29 13:53:37 -07:00
kumavis	6238af6330	fix bad merge	2016-06-28 13:21:25 -07:00
kumavis	4777f82ae0	Merge branch 'master' into notif2	2016-06-28 13:13:06 -07:00
kumavis	57aca116ed	Merge branch 'master' into FixSomeFormatting ... # Conflicts: # CHANGELOG.md # app/scripts/lib/notifications.js	2016-06-28 13:11:50 -07:00
Frankie	16566ee7db	Move clearNotifications to popup.js	2016-06-28 12:57:06 -07:00
kumavis	b1d5a332c0	fix typo	2016-06-28 12:41:37 -07:00
kumavis	c82d7585b8	background - prepare state for notifcations	2016-06-28 12:36:53 -07:00
Frankie	4f4c5048bf	fix #341 close notifications when oppening pop up	2016-06-28 11:57:33 -07:00
kumavis	baba719468	notif - change size for better readability	2016-06-27 16:28:07 -07:00
kumavis	36a183db94	Merge pull request #326 from MetaMask/conf-tx-refactor ... Tx/Msg Conf page + notifcation refactor	2016-06-24 17:29:38 -07:00
kumavis	770528d538	clean - appease the linting machine	2016-06-24 17:27:42 -07:00
kumavis	d7d440b2c2	svg notif now work for msg signatures	2016-06-24 17:22:27 -07:00
Dan Finlay	60fec24c00	Debugged by using a real dapp	2016-06-24 17:00:35 -07:00
Dan Finlay	d3e0e7fe45	Manually debugged refactor	2016-06-24 16:46:18 -07:00
Dan Finlay	122018a96a	Fixed tests	2016-06-24 16:13:27 -07:00
Dan Finlay	fa7e466559	Rename background-controller metamask-controller	2016-06-24 15:55:11 -07:00
Dan Finlay	b2b3f4b26b	Improve refactor ... Replace config-manager-singleton with one that is instantiated within the `background-controller`, and takes its persistence callbacks from its instantiated options. Replaced class getters with more familiar get___() functions.	2016-06-24 15:52:56 -07:00
Dan Finlay	9ed3c676ec	Refactored background.js controller apart from chrome + transport ... Still needs linting fixes, probably bugs, this commit should be used as a draft of what a separation of these concerns might look like.	2016-06-24 13:05:21 -07:00
kumavis	eb1b9d027f	breakout pending-tx-details	2016-06-24 12:48:52 -07:00
kumavis	fce748c118	contentscript - skip web3 injection if domain appears to be a pdf	2016-06-24 11:21:22 -07:00
kumavis	2808fd175b	notif - remove dummy dev notif	2016-06-23 17:33:43 -07:00
kumavis	2468949cb5	some legit linting fixes	2016-06-23 16:53:45 -07:00
kumavis	3cf7bf725f	svg notif - use actual txParams	2016-06-23 16:42:40 -07:00
kumavis	cc7dbace38	tx-conf add non-interactive mode for notification	2016-06-23 15:25:33 -07:00
kumavis	2495c6ea54	svg notifications - remove unneeded deps and clean code	2016-06-23 15:13:24 -07:00
kumavis	2a3660fe60	Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notif	2016-06-23 14:01:16 -07:00
kumavis	2437284515	2.4.4	2016-06-23 12:56:14 -07:00
kumavis	d1e2d842ae	2.4.3	2016-06-23 12:00:14 -07:00
kumavis	122576a790	initial svg notifications	2016-06-22 19:28:11 -07:00
Frankie	9e42f1f3a7	Merge branch 'master' into fontChange	2016-06-22 15:44:30 -07:00