1707 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	6c469a1826	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-10-25 17:00:19 -07:00
Dan Finlay	f9ff6cb55e	Merge branch 'master' into i328-MultiVault	2016-10-25 16:59:58 -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
Kevin Serrano	b3cb3e9ec6	Remove debugger statement.	2016-10-25 13:24:57 -07:00
Kevin Serrano	678301a20e	Phase out extra warning screen.	2016-10-25 13:24:03 -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
Kevin Serrano	16e2f029d8	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-10-23 16:21:11 -07:00
Kevin Serrano	b99b5484fe	Merge branch 'master' into i328-MultiVault	2016-10-23 16:21:02 -07:00
Dan Finlay	152419a79b	Merge branch 'master' into i328-MultiVault	2016-10-21 17:58:18 -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
Dan Finlay	a462fc82e0	Fix duplicate provider menu item bug	2016-10-21 15:19:16 -07:00
Dan Finlay	518ff399fb	Fix loading indication	2016-10-21 14:11:04 -07:00
Dan Finlay	1ddb8b9aec	Added tx & msg managing functionality to new KeyringController	2016-10-21 13:41:33 -07:00
Dan Finlay	626b52d24a	Fix bug in new KeyringController vault restoring logic.	2016-10-21 13:11:30 -07:00
Dan Finlay	ee73e373a0	Create new vault before each keyringController unit test	2016-10-21 12:26:56 -07:00
Dan Finlay	44aa1be277	Create basic keyring-controller unit test file	2016-10-21 12:11:54 -07:00
Dan Finlay	c3e1c5c57f	Added SimpleKeyring tests	2016-10-21 11:10:36 -07:00
Dan Finlay	9560ae93ee	Added tx and msg signing to keychain & controller	2016-10-20 19:06:17 -07:00
Dan Finlay	957b7a72b5	Improved simple account generation	2016-10-20 17:29:25 -07:00
Dan Finlay	55d56f77cf	Began adding first basic keyring	2016-10-20 16:45:58 -07:00
Dan Finlay	351c8e2086	Merge branch 'master' into i328-MultiVault	2016-10-20 14:02:24 -07:00
Kevin Serrano	231dc61e3f	Merge branch 'master' into i328-MultiVault	2016-10-20 13:45:45 -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