1553 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	ad3fa24a28	Intermediary commit.	2016-10-19 14:55:08 -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	1481a3ef8e	Initial work on UI side	2016-10-15 10:48:12 -07:00
Kevin Serrano	7cba71fc55	Merge branch 'i328-MultiVault' of github.com:MetaMask/metamask-plugin into origin/i328-MultiVault	2016-10-12 17:12:52 -07:00
Dan Finlay	cd2c00a318	Add minimal method signatures to new keyring controller	2016-10-12 17:05:39 -07:00
Dan Finlay	93ed918caa	Remove additional deprecated action	2016-10-12 16:43:35 -07:00
Dan Finlay	5c9969e126	Remove opinionated seed word code ... Completely breaking all account maangement, I have removed the opinionated seed-word code from the UI. Web3 injection still seems to work.	2016-10-12 16:31:15 -07:00
kumavis	8d5b2478e3	Merge pull request #730 from MetaMask/i695-dapp-reload ... dapp reload - fixed disconnect detection via polling	2016-10-12 13:52:32 -07:00
kumavis	465cff78c3	Merge branch 'master' into i695-dapp-reload	2016-10-12 13:49:18 -07:00
Kevin Serrano	f68673e84a	Merge pull request #733 from MetaMask/tos-fix ... Fix misnamed variable.	2016-10-12 13:08:37 -07:00
Kevin Serrano	d750daed5c	Remove logs.	2016-10-12 13:05:15 -07:00
Kevin Serrano	3954ed2a7e	Fix misnamed variable.	2016-10-12 13:04:21 -07:00
kumavis	88a68f732e	Merge branch 'master' into i695-dapp-reload	2016-10-12 13:03:15 -07:00
kumavis	a1c3c944cf	dapp reload - fixed disconnect detection via polling	2016-10-12 12:35:55 -07:00
Dan Finlay	535d832a64	Merge branch 'master' into i328-MultiVault	2016-10-12 10:58:58 -07:00
Frankie	d67a5031c7	Merge pull request #723 from MetaMask/i721-ScrollAccountList ... I721 scroll account list	2016-10-11 16:18:37 -07:00
Dan Finlay	5d01d50c16	Merge branch 'master' into i721-ScrollAccountList	2016-10-11 16:13:53 -07:00
Dan Finlay	bbaf79f576	Merge pull request #702 from MetaMask/tos ... Terms of Service UI Update	2016-10-11 16:13:21 -07:00
Kevin Serrano	39f2118d31	Remove logs.	2016-10-11 16:03:52 -07:00
Dan Finlay	e1ece0f0e3	Bump changelog	2016-10-11 16:00:31 -07:00
Dan Finlay	1dc2612f8e	Remove flex class from account list container	2016-10-11 15:59:55 -07:00
Dan Finlay	06910025ff	Add more accounts to account list ui state	2016-10-11 15:59:39 -07:00
Kevin Serrano	5c0c370fe4	Remove comments.	2016-10-11 15:52:44 -07:00
Kevin Serrano	9d267907ee	Merge branch 'tos' of github.com:MetaMask/metamask-plugin into tos	2016-10-11 15:51:26 -07:00
Kevin Serrano	5e9bc31c58	Cleanup.	2016-10-11 15:50:02 -07:00
Dan Finlay	5c9476e57d	Fix bug where new vaults had no nicknames	2016-10-11 15:29:12 -07:00
Dan Finlay	ea1a934c7d	Add initial KeyringController files	2016-10-11 15:12:23 -07:00
Dan Finlay	f8b52a3895	Add to doc	2016-10-11 15:06:09 -07:00
Kevin Serrano	f7361d9654	lint	2016-10-11 14:49:24 -07:00
Kevin Serrano	79a99ac93b	Move tos hash comparison logic from background to mm controller.	2016-10-11 14:33:30 -07:00
Kevin Serrano	26bd4b25ef	Remove version from terms of service.	2016-10-11 14:33:05 -07:00
Kevin Serrano	ed03b89e26	Move tos hash logic to build phase. Create dynamic global variables based on build.	2016-10-11 14:32:03 -07:00
Dan Finlay	dec282f4fd	Add multi-vault planning doc	2016-10-07 15:17:35 -07:00
Kevin Serrano	89780bd22a	Modify changelog.	2016-10-07 02:11:14 -07:00
Kevin Serrano	0ecf364c5b	Prevent back/login buttons from appearing on the terms of service.	2016-10-07 02:11:03 -07:00
Kevin Serrano	21d1959435	Fix linting and guarantees set TOS hash.	2016-10-07 01:54:12 -07:00
Kevin Serrano	e4f2cd2e09	Fix retention of terms of service hash across reloads of plugin.	2016-10-07 01:42:13 -07:00
Kevin Serrano	7c5ebb6a53	Renamed variables to make more sense.	2016-10-07 01:41:27 -07:00
Kevin Serrano	d200ef4a10	Add missing path require statement.	2016-10-07 01:14:25 -07:00
Kevin Serrano	6a1a85ffdd	Merge branch 'tos' into tosplusupdatecheck	2016-10-07 00:11:00 -07:00
Kevin Serrano	4b3f374638	Merge branch 'master' into tos	2016-10-07 00:10:43 -07:00
Kevin Serrano	0a9b814f11	On update, check whether the TOS has changed using hashes.	2016-10-06 03:25:03 -07:00
Kevin Serrano	4ea3246912	Add controller functions for storing and checking TOS hashes.	2016-10-06 03:24:28 -07:00
Kevin Serrano	db06813404	Add new functions for storing TOS hashes in config manager.	2016-10-06 03:23:47 -07:00
Kevin Serrano	3fbccdee90	Add string-hash as a package.	2016-10-06 03:21:33 -07:00
Dan Finlay	0182f8a4e9	Merge pull request #710 from MetaMask/EmphasizeAutoUpdating ... Emphasize auto-updating in announcement	2016-10-05 20:28:02 -07:00
Kevin Serrano	671b54ff71	Merge branch 'master' into tos	2016-10-05 19:53:41 -07:00
Kevin Serrano	e20e0f661d	Fix integration test.	2016-10-05 19:49:53 -07:00