3163 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	de500250c4	Fix build for eth-contract-metadata	2017-06-13 17:46:47 -07:00
Dan Finlay	a741cc4fc4	Merge branch 'master' into AddTokenList	2017-06-12 17:17:16 -07:00
kumavis	bbe0c73dca	Merge pull request #1597 from MetaMask/Version-3.7.8 ... Version 3.7.8	2017-06-12 16:20:04 -07:00
Dan Finlay	844159cb18	Version 3.7.8	2017-06-12 15:57:01 -07:00
kumavis	16593d0b9d	Merge pull request #1592 from MetaMask/qrPrefix ... prefix the address with "ethereum:"	2017-06-12 15:23:53 -07:00
Frankie	3da887e56e	Merge branch 'master' into qrPrefix	2017-06-12 15:09:53 -07:00
frankiebee	b712e7ce64	add to CHANGELOG	2017-06-12 14:48:55 -07:00
frankiebee	d1fa3c6de1	only prefix ethereum address	2017-06-12 14:38:26 -07:00
Frankie	33a32bb06b	Merge pull request #1594 from MetaMask/prov-eng-bump ... deps - prov-eng 12.2.4	2017-06-12 14:24:15 -07:00
kumavis	3b3c96ef34	Merge pull request #1208 from MetaMask/i#1203MainNetSwitch ... Change default to mainnet	2017-06-12 14:22:07 -07:00
kumavis	9fd9c34574	deps - prov-eng 12.2.4	2017-06-12 14:09:38 -07:00
frankiebee	5668910244	prefix the address with "ethereum:"	2017-06-12 14:05:08 -07:00
kumavis	c0a023ffdb	default testnet - fix typo	2017-06-12 13:46:56 -07:00
Frankie	670fbf6da0	Merge pull request #1591 from MetaMask/ignore-package-lock ... gitignore - add package-lock and re-arrange by category	2017-06-12 13:45:14 -07:00
kumavis	e8d5d85a16	gitignore - remove cached package-lock	2017-06-12 13:34:02 -07:00
Frankie	fe87a908ff	Merge pull request #1585 from MetaMask/t-lint ... Lint Fixes	2017-06-12 13:33:09 -07:00
kumavis	997f38c219	gitignore - add package-lock and re-arrange by category	2017-06-12 13:30:59 -07:00
kumavis	27220b7bcd	Merge branch 'master' into i#1203MainNetSwitch	2017-06-12 13:27:04 -07:00
Thomas Huang	13e6672028	Linting	2017-06-12 11:08:32 -07:00
Dan Finlay	8af41f1b05	Merge pull request #1574 from MetaMask/internfix ... Wording fix for notice button	2017-06-12 10:37:46 -07:00
kumavis	2d5a672971	Merge pull request #1572 from MetaMask/mascaraUpkeep ... Mascara upkeep	2017-06-12 10:36:48 -07:00
Dan Finlay	4298d80127	Merge pull request #1552 from MetaMask/currency-fix ... Fix Currency API	2017-06-12 10:36:36 -07:00
Dan Finlay	7057c24471	Merge pull request #1570 from MetaMask/addfaq ... Modify FAQ to be more visible.	2017-06-12 10:36:16 -07:00
Dan Finlay	ba254d9041	Merge branch 'master' into currency-fix	2017-06-12 10:32:54 -07:00
Dan Finlay	2e6e6e4125	Merge pull request #1535 from MetaMask/gasupdater ... Update GasBlockLimits on every new block	2017-06-12 10:30:25 -07:00
Dan Finlay	3e1d648ec0	Merge branch 'master' into gasupdater	2017-06-12 10:26:40 -07:00
Kevin Serrano	2fcf3d8439	Modify wording to new accept.	2017-06-09 10:48:28 -07:00
frankiebee	3d1d38a2c0	reload page if ui is not present	2017-06-08 17:36:21 -07:00
frankiebee	a0a19468a8	reload the page when switching networks	2017-06-08 17:34:51 -07:00
frankiebee	4941b5ab11	bump cswready event	2017-06-08 17:33:27 -07:00
frankiebee	1a70141e8b	clean up code	2017-06-08 17:32:50 -07:00
Dan Finlay	cd3362f941	Merge pull request #1571 from MetaMask/tracker-warp ... deps - bump provider engine for warp feature	2017-06-08 17:07:17 -07:00
Dan Finlay	e9c693eae4	Version bump changelog	2017-06-08 16:44:11 -07:00
kumavis	017c7c4c00	3.7.7	2017-06-08 16:42:00 -07:00
kumavis	f994461763	changelog - note on block-tracker warp	2017-06-08 16:21:16 -07:00
Kevin Serrano	cb95129fa1	Merge branch 'master' of github.com:nihar97/metamask-plugin into internfix	2017-06-08 16:10:59 -07:00
kumavis	57a7fc4425	deps - bump provider engine for warp feature	2017-06-08 16:07:05 -07:00
Kevin Serrano	a37c8f3ed0	Modify FAQ to be more visible.	2017-06-08 16:02:23 -07:00
Kevin Serrano	f788ba7244	Resolve changelog merging.	2017-06-05 16:27:15 -07:00
Kevin Serrano	deb882bd6e	Merge branch 'master' into currency-fix	2017-06-05 16:26:49 -07:00
Kevin Serrano	0fb38632be	Bump changelog.	2017-06-05 16:25:02 -07:00
Kevin Serrano	f7773538eb	Modify tests for new api mock.'	2017-06-05 16:24:32 -07:00
Kevin Serrano	203a573f3f	Use new URL for currency API from cryptonator.	2017-06-05 16:23:56 -07:00
kumavis	29c7739efc	Merge pull request #1551 from MetaMask/i1550-FixContractPublication ... I1550 fix contract publication	2017-06-05 16:00:28 -07:00
Dan Finlay	838ffb62ee	Version 3.7.6	2017-06-05 15:36:18 -07:00
Dan Finlay	c8f0802a8e	Fix bug that prevented publishing contracts	2017-06-05 15:35:52 -07:00
Dan Finlay	9d5525ecf6	Merge pull request #1547 from MetaMask/Version-3.7.5 ... Version 3.7.5	2017-06-05 14:00:46 -07:00
Dan Finlay	d0144c2853	Break docs up into individual files	2017-06-05 13:55:48 -07:00
Dan Finlay	7f991e5574	Add publishing guide	2017-06-05 13:46:18 -07:00
Dan Finlay	e99ce3763a	Add publishing guide to readme	2017-06-05 13:42:41 -07:00