2676 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dan Finlay	fc77a36a55	Merge pull request #1119 from MetaMask/i1089-networkfront ... Network display/change on lock screen	2017-02-15 17:31:19 -08:00
Dan Finlay	006804513a	Merge branch 'master' into i1089-networkfront	2017-02-15 16:33:41 -08:00
kumavis	d5fcfd6078	Merge pull request #1123 from MetaMask/kumavis-patch-1 ... keyring controller - update memStore after restoreKeyring	2017-02-15 16:30:04 -08:00
Dan Finlay	48ab446436	Add memstore update after adding new keyring	2017-02-15 16:25:47 -08:00
Dan Finlay	6d103dc1e7	Merge branch 'kumavis-patch-1' of github.com:MetaMask/metamask-plugin into kumavis-patch-1	2017-02-15 16:09:16 -08:00
kumavis	943bcec0d7	keyring controller - update memStore after restoreKeyring	2017-02-15 16:04:40 -08:00
Kevin Serrano	c12bea5b2e	Merge branch 'master' into i1089-networkfront	2017-02-15 15:56:37 -08:00
Kevin Serrano	3bd23564fb	Merge pull request #1121 from MetaMask/dev ... Merge dev into master	2017-02-15 15:56:25 -08:00
Dan Finlay	352bb5cb39	Merge branch 'master' into dev	2017-02-15 15:49:04 -08:00
Kevin Serrano	3fe8e2b659	Merge branch 'master' into i1089-networkfront	2017-02-15 15:44:14 -08:00
Kevin Serrano	6a3b93b06e	Changelog.	2017-02-15 15:38:38 -08:00
Kevin Serrano	9aa70fbaba	Remove custom RPC option when on lock screen.	2017-02-15 15:37:38 -08:00
Kevin Serrano	fbabcf6191	Change networks from lock screen.	2017-02-15 15:35:56 -08:00
Kevin Serrano	cdd4faa917	Merge pull request #1117 from MetaMask/disclaimer-clean ... Migration Testing	2017-02-15 11:29:21 -08:00
Kevin Serrano	6ef78eb02b	Add to changelog.	2017-02-15 11:16:35 -08:00
Kevin Serrano	d0e2846eca	Complete migration tests.	2017-02-15 11:15:47 -08:00
Kevin Serrano	6ddd613a15	Adding additional migration state to account for moving data.	2017-02-15 11:15:33 -08:00
Kevin Serrano	75f7c1244a	Made migrations non-destructive; fixed currency migration.	2017-02-15 11:14:53 -08:00
kumavis	f2539d125c	Merge pull request #1113 from MetaMask/RecoverTests ... Add tests showing recovering public key from signature	2017-02-15 10:51:49 -08:00
Kevin Serrano	cd75d86187	Add migrations for removing terms of use data.	2017-02-14 13:21:00 -08:00
Dan Finlay	0b0eec9c52	Bump changelog	2017-02-13 21:30:08 -08:00
Dan Finlay	97b8410b30	Verify messages in a loop	2017-02-13 21:29:22 -08:00
Dan Finlay	f2486fbdd3	got hash test passing	2017-02-13 21:25:02 -08:00
Dan Finlay	b862d94209	Add failing test for signature recovery	2017-02-13 20:13:11 -08:00
Kevin Serrano	ec8aa3d1f2	Merge pull request #1111 from MetaMask/mapachurro-patch-1 ... Mapachurro - Update first-time.js	2017-02-10 13:36:34 -08:00
Kevin Serrano	603eee9efe	Merge branch 'mapachurro-patch-1' of github.com:mapachurro/metamask-plugin into mapachurro-patch-1	2017-02-10 13:14:09 -08:00
Kevin Serrano	65f50ec7ee	Merge pull request #1108 from MetaMask/disclaimer-notify ... Integrate disclaimer with notification system	2017-02-10 13:12:24 -08:00
Kevin Serrano	8f72748732	fix debug	2017-02-09 22:58:17 -08:00
Kevin Serrano	8b38719a7c	Prevent notices from opening in test and debug mode.	2017-02-09 22:55:14 -08:00
Kevin Serrano	092ec9096b	Fix integration tests.	2017-02-09 22:36:40 -08:00
Kevin Serrano	c7178af09d	Remove trailing comma in JSON.	2017-02-09 22:25:21 -08:00
Kevin Serrano	f9601ac2dd	Merge branch 'dev' into disclaimer-notify	2017-02-09 19:04:17 -08:00
Kevin Serrano	01e43c789c	Merge pull request #1101 from MetaMask/i1085-synchronousnet ... Allowed net_version to be called synchronously	2017-02-09 19:03:22 -08:00
Kevin Serrano	07422ae835	Merge pull request #1107 from MetaMask/Version-3.2.2 ... Version 3.2.2	2017-02-09 18:58:58 -08:00
kumavis	d1a6b8c8ed	Merge branch 'dev' into i1085-synchronousnet	2017-02-09 18:41:01 -08:00
Dan Finlay	26ae3d206f	Version 3.2.2	2017-02-09 18:21:11 -08:00
Kevin Serrano	65c84ac4b2	Delete all code related to disclaimers.	2017-02-09 18:17:50 -08:00
kumavis	81a289cc5f	Merge pull request #1105 from MetaMask/rollbackEthSighn ... Rollback eth sign	2017-02-09 18:17:14 -08:00
mapachurro	5c9202b2d2	Update first-time.js	2017-02-09 20:54:29 -05:00
Kevin Serrano	1d0fcf129c	Fix bugs with notice. Add disclaimer notice.	2017-02-09 17:47:51 -08:00
Frankie	26cd66cb62	Add to CHANGELOG	2017-02-09 17:34:05 -08:00
Frankie	de6455151e	Revert old style message sighing	2017-02-09 17:32:49 -08:00
Kevin Serrano	4033b620bd	Allowed net_version to be called synchronously	2017-02-08 15:51:22 -08:00
Kevin Serrano	bd34d53c84	Merge pull request #1099 from MetaMask/dev ... Publish 3.2.1	2017-02-08 13:21:35 -08:00
kumavis	2f6bf1c074	Merge branch 'master' into dev	2017-02-08 13:17:30 -08:00
kumavis	6d163de3b5	Merge pull request #1098 from MetaMask/Version-3.2.1 ... Version 3.2.1	2017-02-08 13:16:48 -08:00
Dan Finlay	5d827bece3	Version 3.2.1	2017-02-08 13:12:40 -08:00
kumavis	c9aab2084e	Merge pull request #1094 from MetaMask/dev ... Version 3.2.0	2017-02-07 18:55:26 -08:00
Dan Finlay	ce57957aa0	Merge pull request #1093 from MetaMask/Version-3.2.0 ... Version 3.2.0	2017-02-07 16:16:32 -08:00
Dan Finlay	480c7c5d24	Version 3.2.0	2017-02-07 16:11:30 -08:00