1279 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	0186e05a0d	Linted	2016-09-06 17:30:38 -07:00
Dan Finlay	1537e3f5da	Add fiat balances to tx conf view	2016-09-06 17:28:25 -07:00
Dan Finlay	16fe97676c	Add fiat conversion to pending tx development state	2016-09-06 17:27:26 -07:00
Dan Finlay	c46de79c10	Got basic fiat display modularized	2016-09-06 17:08:56 -07:00
Dan Finlay	90638f95c0	Fix fiat-value	2016-09-06 16:55:52 -07:00
Dan Finlay	09dd854a96	Nearly finished factoring fiat value into eth-balance	2016-09-06 16:45:06 -07:00
Dan Finlay	58a8f02294	Merge branch 'master' into ModularFiatBalance	2016-09-06 15:29:36 -07:00
Kevin Serrano	095a40e33d	Merge pull request #614 from MetaMask/i546-NegativeErr ... Add negative value validation to tx approval	2016-09-06 15:29:18 -07:00
Dan Finlay	dcc24804a1	Add negative value validation to tx approval	2016-09-06 15:23:48 -07:00
Kevin Serrano	f6be97d9cf	Merge pull request #611 from vincentserpoul/patch-1 ... Error message more helpful	2016-09-05 23:14:55 -07:00
Vincent Serpoul	4cf12337f2	linting	2016-09-06 11:24:09 +08:00
Vincent Serpoul	76d63ec4e0	Error message more helpful	2016-09-06 11:20:22 +08:00
kumavis	9857702e69	Merge pull request #609 from MetaMask/livereload ... Add ability to disable livereload	2016-09-03 14:25:12 -07:00
Dan Finlay	b2ebb6032d	Continuing fiat balance modularization	2016-09-03 14:20:27 -07:00
Kevin Serrano	be0c605556	Fix boolean.	2016-09-02 14:42:20 -07:00
Kevin Serrano	831ed15777	Merge branch 'master' into livereload	2016-09-02 14:16:13 -07:00
Kevin Serrano	288d4a2885	Merge pull request #608 from MetaMask/2.10.2 ... Version 2.10.2	2016-09-02 14:15:46 -07:00
Kevin Serrano	068bd7d40a	Merge branch 'master' into livereload	2016-09-02 14:15:24 -07:00
Kevin Serrano	f9f821e726	Changelog add.	2016-09-02 14:15:15 -07:00
Kevin Serrano	2d0077d5c6	Changelog add and rename vars.	2016-09-02 14:15:00 -07:00
Kevin Serrano	b4334a72b4	Refactor for spreading. Add conditionals for livereload.	2016-09-02 14:00:36 -07:00
kumavis	c2a1b442e9	Version 2.10.2	2016-09-02 13:51:22 -07:00
Kevin Serrano	bdc7fd7c6f	Merge pull request #607 from MetaMask/notif-fix ... notif - use standard err-first callback style	2016-09-02 13:45:29 -07:00
Kevin Serrano	822198e092	Merge branch 'master' into notif-fix	2016-09-02 13:36:07 -07:00
kumavis	891e17c44c	notif - use standard err-first callback style	2016-09-02 13:29:47 -07:00
kumavis	7583bbf937	Merge pull request #606 from MetaMask/2.10.1 ... Version 2.10.1	2016-09-02 12:54:58 -07:00
kumavis	8b37bcf16b	Version 2.10.1	2016-09-02 12:48:50 -07:00
Kevin Serrano	c02be4fa66	Add production flag. Conditionally copy reload based on production.	2016-09-01 15:19:31 -07:00
Kevin Serrano	168b4c5bc0	Install deps. Fix chrome/firefox typo.	2016-09-01 15:01:45 -07:00
Kevin Serrano	a76e198c9c	Merge pull request #603 from MetaMask/i566-NoPopupWhenOpen ... Don't show popup when sending tx from within metamask	2016-09-01 11:39:08 -07:00
Dan Finlay	34fd23803d	Merge branch 'master' into i566-NoPopupWhenOpen	2016-09-01 11:34:38 -07:00
Dan Finlay	a6e3357d22	Bump changelog	2016-09-01 11:33:54 -07:00
Dan Finlay	4f614d0852	Linted	2016-09-01 11:31:39 -07:00
Dan Finlay	7b1bbb7a19	Show conf screen after send request	2016-09-01 11:30:42 -07:00
Dan Finlay	7f947f8ab2	Skip loading indication from send screen	2016-09-01 11:29:17 -07:00
Dan Finlay	47b2ae1c5f	Do not open popup for internally produced txs	2016-09-01 11:26:27 -07:00
Dan Finlay	32345bda77	Merge pull request #601 from MetaMask/filterfix ... inpage - remap ids on response	2016-08-31 16:16:08 -07:00
kumavis	532737a101	inpage - remap ids on response	2016-08-31 15:40:05 -07:00
Dan Finlay	d26dd53fe1	Merge pull request #600 from MetaMask/i597-ModifyInfuraUrls ... Add metamask route to infura urls	2016-08-31 11:31:23 -07:00
Dan Finlay	44545e0f47	Add metamask route to infura urls ... Fixes #597 Allows metamask-specific RPC metrics.	2016-08-31 11:10:25 -07:00
kumavis	791e80988d	Merge pull request #596 from MetaMask/EdgeCompatibility ... Edge compatibility	2016-08-29 18:27:55 -07:00
Dan Finlay	c15eef9425	Make element enumeration Edge compatible	2016-08-29 17:34:29 -07:00
Dan Finlay	e4e7489dd9	Add test for Edge compatibility	2016-08-29 17:34:12 -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	fb6476224f	Add tolerance for failed form persisting	2016-08-29 16:40:57 -07:00
Dan Finlay	e85418b11a	Merge branch 'master' into EdgeCompatibility	2016-08-29 16:14:51 -07:00