1628 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	678301a20e	Phase out extra warning screen.	2016-10-25 13:24:03 -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
Dan Finlay	7d7cb9af9d	Fix background connection references	2016-10-20 12:13:12 -07:00
Dan Finlay	0deed17752	Fix tests	2016-10-20 12:07:53 -07:00
Dan Finlay	383f8ea7dc	Linted & added salting to vault	2016-10-20 11:33:18 -07:00
Dan Finlay	e5c95d68f8	Fix state updating after vault creation and unlocking	2016-10-20 11:00:38 -07:00
Dan Finlay	2132477797	Fix unlock logic	2016-10-20 10:28:45 -07:00
Dan Finlay	f090828f99	Commented out useless advanced not on init screen	2016-10-20 09:58:44 -07:00
Dan Finlay	f14fdf7a25	Change actions reference to keyringController to background	2016-10-20 09:58:33 -07:00
Dan Finlay	40f175c06f	Linted	2016-10-20 09:50:29 -07:00
Dan Finlay	331bb735c7	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into i328-MultiVault	2016-10-20 09:49:49 -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
Kevin Serrano	12698b9462	Resolve merge conflict.	2016-10-19 17:49:13 -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
Dan Finlay	94f2554369	Add debug flag to dev mode	2016-10-19 15:15:27 -07:00
Kevin Serrano	afbc4c832b	Git merge resolution.	2016-10-19 14:57:30 -07:00
Kevin Serrano	ad3fa24a28	Intermediary commit.	2016-10-19 14:55:08 -07:00
Frankie	5fb1e492fb	Add valdations to txData param	2016-10-19 14:33:30 -07:00
Kevin Serrano	725d503f68	Remove unused crypto dependencies.	2016-10-19 14:06:48 -07:00
Kevin Serrano	153bb25947	Add crypto packages to package.json	2016-10-19 13:56:21 -07:00
Kevin Serrano	17506fe14f	Merge in crypto.	2016-10-19 11:17:29 -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