1665 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Dan Finlay	b3613232a2	Rename wallet to account ... Fixes #762	2016-10-25 16:54:43 -07:00
Dan Finlay	9b8c970706	Update web3.js version	2016-10-25 16:43:56 -07:00
Dan Finlay	bda64ab132	Fix delegate call analysis ... Fixed reference allowing transactions to be analyzed for delegate call again.	2016-10-25 14:58:04 -07:00
Dan Finlay	f2497c5a97	Bump changelog	2016-10-25 14:17:15 -07:00
Dan Finlay	b1fb8da3b0	Fix provider menu selection indication	2016-10-25 14:16:04 -07:00
kumavis	f7688ac3cf	Merge pull request #745 from MetaMask/i743-FixDelegateCallFlag ... Reproduced issue 743 in test case	2016-10-24 16:24:29 -07:00
kumavis	3af3565000	test - fix delegate-call test	2016-10-24 16:12:44 -07:00
kumavis	85d03cc8fb	Merge branch 'master' into i743-FixDelegateCallFlag	2016-10-24 12:24:19 -07:00
Dan Finlay	eba37e773d	Merge pull request #752 from MetaMask/i#741 ... Add validations to txData param in send form	2016-10-21 17:24:04 -07:00
Frankie	7d9e295b75	Change regex in isHex function	2016-10-21 16:39:14 -07:00
Frankie	8326258b58	Merge branch 'i#741' of https://github.com/MetaMask/metamask-plugin into i#741	2016-10-21 16:07:49 -07:00
Frankie	d79424e9c0	clean up the isHex function	2016-10-21 16:05:39 -07:00
Frankie	eedca82167	Merge branch 'master' into i#741	2016-10-20 12:37:08 -07:00
Frankie	8d2ec8b820	Merge pull request #751 from MetaMask/ClarifyCallbackRole ... Add note about callback param to sync method warning	2016-10-20 12:36:41 -07:00
Frankie	d4c0a4949b	Clean up tests	2016-10-20 12:26:35 -07:00
Frankie	aa4746f4c7	Add test and ability for isHex to handle hex strings with hex-prefix	2016-10-19 19:35:44 -07:00
Frankie	ac7dca22c3	Fix up wording	2016-10-19 17:39:41 -07:00
Frankie	7140c04ef9	Fix CHANGELOG	2016-10-19 15:26:19 -07:00
Frankie	2f7ce1ca4c	Merge branch 'master' into i#741	2016-10-19 15:25:27 -07:00
Frankie	4366f72fe1	Add unit test for isHex and add to CHANGELOG.md	2016-10-19 15:22:56 -07:00
Dan Finlay	090959470b	Add note about callback param to sync method warning	2016-10-19 15:16:27 -07:00
Frankie	5fb1e492fb	Add valdations to txData param	2016-10-19 14:33:30 -07:00
Kevin Serrano	82489129d5	Merge branch 'master' into i743-FixDelegateCallFlag	2016-10-18 14:20:16 -07:00
Kevin Serrano	a88a48ba14	Merge pull request #749 from MetaMask/Version-2.13.5 ... Version 2.13.5	2016-10-18 14:20:09 -07:00
Dan Finlay	f31fef034f	Fix changelog date	2016-10-18 14:07:47 -07:00
Dan Finlay	182fd30db5	Fix cli flag capitalization	2016-10-18 14:02:06 -07:00
Dan Finlay	70f3d24e90	Version 2.13.5	2016-10-18 14:00:33 -07:00