1642 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	68d5b459ed	Merge pull request #811 from MetaMask/deadly-fix ... Fix error display in confirmation screen	2016-11-14 22:39:17 -05:00
Kevin Serrano	acf02c9290	Merge branch 'deadly-fix' of github.com:MetaMask/metamask-plugin into deadly-fix	2016-11-14 11:21:51 -08:00
Kevin Serrano	205205f7cd	Add to changelog.	2016-11-14 11:19:58 -08:00
Kevin Serrano	d891869eff	First attempt at fixing errors in confirmation screen.	2016-11-14 11:19:01 -08:00
Kevin Serrano	26a548a7a3	First attempt at fixing errors in confirmation screen.	2016-11-14 11:17:53 -08:00
kumavis	115fdc36fe	Merge pull request #807 from MetaMask/cssIsAwesome ... Fix funny looking errors in conf-tx	2016-11-11 01:31:23 -05:00
Frankie	b60f51dfc2	lint fix	2016-11-10 22:20:58 -08:00
Frankie	b60992b446	Fix funny looking errors in conf-tx	2016-11-10 22:13:30 -08:00
kumavis	f88079c6b9	Merge pull request #805 from MetaMask/i804 ... detect tx error - show warning and fix gasLimit	2016-11-11 00:37:09 -05:00
kumavis	1d0abc4771	changelog - update	2016-11-10 21:26:10 -08:00
kumavis	536cab0687	detect tx error - show warning and fix gasLimit	2016-11-10 21:19:34 -08:00
Kevin Serrano	3775a4bf79	Merge pull request #801 from MetaMask/deadly ... Properly implement 20% gas bump	2016-11-09 16:42:10 -08:00
Kevin Serrano	e2b2083df0	remove gas field, due to alias redundancy.	2016-11-09 16:38:28 -08:00
Kevin Serrano	b6b4be61d9	Fix bug for increasing gas by 20 percent.	2016-11-09 16:29:24 -08:00
Kevin Serrano	14a833f5c0	Merge branch 'deadly' of github.com:MetaMask/metamask-plugin into deadly	2016-11-09 14:28:23 -08:00
Frankie	ebcdb7a491	Merge pull request #797 from MetaMask/Version-2.13.7 ... Version 2.13.7	2016-11-08 09:22:10 -08:00
Dan Finlay	b57009493b	Hard coding jazzicon at working version	2016-11-08 08:54:30 -08:00
Dan Finlay	4a0197012e	Version 2.13.7	2016-11-08 08:51:14 -08:00
Dan Finlay	2160eb35aa	Merge pull request #796 from MetaMask/IncreaseGasBuffer ... Increase gas buffer	2016-11-08 08:49:43 -08:00
Dan Finlay	7068d2e71c	Adjust gas buffer to be 20% over estimate	2016-11-08 08:39:41 -08:00
Dan Finlay	6f39924e60	Increase gas buffer ... Fixes #795	2016-11-08 08:32:34 -08:00
Kevin G. Serrano	7b3f1ecc41	Unify warning functions.	2016-11-07 16:02:02 -08:00
Kevin Serrano	62a15fc59e	Merge pull request #793 from MetaMask/i787-HighGasBug ... i787 High gas bug	2016-11-07 12:06:08 -08:00
Dan Finlay	1896928562	Fix gas price buffering ... Our gas price buffering logic had a bug, because bn.js has inconsistent behavior when using hex-prefixed output. The issue has been opened with them here: https://github.com/indutny/bn.js/issues/151 We've corrected our usage in the mean time.	2016-11-07 11:56:20 -08:00
Dan Finlay	fff5a6765e	Added failing test for #787	2016-11-07 11:25:23 -08:00
kumavis	30ff9b5e10	Merge pull request #786 from MetaMask/i763-GithubLink ... Fix github link on info page	2016-10-31 12:56:12 -04:00
Dan Finlay	18cf635735	Fix github link on info page	2016-10-31 09:30:55 -07:00
kumavis	48220cff0e	Merge pull request #778 from MetaMask/mascara-build ... Mascara build	2016-10-26 15:34:23 -07:00
kumavis	b790b0c256	mascara - remove global transpile	2016-10-26 15:29:13 -07:00
kumavis	d047ba541f	mascara - example dapp - log main account	2016-10-26 15:27:38 -07:00
Dan Finlay	014c971b89	Merge pull request #774 from MetaMask/walkThrough ... Add more info to mascara README	2016-10-26 14:42:10 -07:00
Frankie	08c8dc823e	Merge branch 'master' into walkThrough	2016-10-26 14:09:03 -07:00
Frankie	a75edcdc18	Fix typos and clean up	2016-10-26 13:57:15 -07:00
kumavis	5f98814877	Merge pull request #767 from MetaMask/UpdateWeb3 ... Update web3.js version	2016-10-26 13:55:17 -07:00
Frankie	55530b0138	Merge branch 'master' into walkThrough	2016-10-26 13:45:42 -07:00
Frankie	5ae45fe17f	Fix the size of the pop-up	2016-10-26 13:43:26 -07:00
Frankie	bdaf940593	Add more info about first use	2016-10-26 13:42:56 -07:00
Dan Finlay	ab055e3f63	Merge branch 'master' into UpdateWeb3	2016-10-26 11:56:04 -07:00
Dan Finlay	9df20e6c55	Merge pull request #773 from MetaMask/Version-2.13.6 ... Version 2.13.6	2016-10-26 11:54:06 -07:00
Dan Finlay	b8acdfcab5	Version 2.13.6	2016-10-26 11:48:42 -07:00
Dan Finlay	1d1c64cf89	Merge branch 'master' into UpdateWeb3	2016-10-26 11:44:28 -07:00
Dan Finlay	0bad941433	Merge pull request #768 from MetaMask/i762-RenameWalletToAccount ... Rename wallet to account	2016-10-26 11:43:52 -07:00
Dan Finlay	0bf139188e	Merge branch 'master' into i762-RenameWalletToAccount	2016-10-26 11:38:09 -07:00
kumavis	84bd8784d0	deps - web3 - set version to 0.17.0-beta	2016-10-26 11:36:43 -07:00
Dan Finlay	c834b4f637	Merge branch 'master' into i762-RenameWalletToAccount	2016-10-26 11:31:08 -07:00
Kevin Serrano	2dad59b561	Merge pull request #764 from MetaMask/761-FixCustomMordenIndication ... Fix provider menu selection indication	2016-10-26 11:06:29 -07:00
Dan Finlay	f1bbaeea50	Merge branch 'master' into 761-FixCustomMordenIndication	2016-10-26 10:51:07 -07:00
Dan Finlay	693c30d784	Merge pull request #769 from MetaMask/FixDelegateCall ... Fix delegate call function reference 2	2016-10-25 17:45:18 -07:00
Dan Finlay	21e7331111	Fix delegate call function reference 2	2016-10-25 17:41:50 -07:00
Dan Finlay	1cabeb2fc4	Merge pull request #766 from MetaMask/FixDelegateCallCheck ... Fix delegate call analysis	2016-10-25 17:38:03 -07:00