2742 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	ae82e8f5c7	Merge branch 'master' into i1128-noticesdev ... borts	2017-02-20 15:08:13 -08:00
Kevin Serrano	736637363b	Integration tests play nice with new disabled buttons.	2017-02-20 15:07:01 -08:00
Kevin Serrano	2de7467470	Merge branch 'master' into AddBetterLogger	2017-02-20 15:02:50 -08:00
Dan Finlay	861f5c5cbb	Merge pull request #1139 from MetaMask/Version-3.3.0 ... Version 3.3.0	2017-02-20 15:02:40 -08:00
Kevin Serrano	e54b73679c	Notices must be scrolled down to proceed from.	2017-02-20 14:58:24 -08:00
Dan Finlay	04e80d36be	Version 3.3.0	2017-02-20 14:46:55 -08:00
Dan Finlay	f7a4cb4f1e	Merge branch 'master' into AddBetterLogger	2017-02-20 14:45:37 -08:00
Dan Finlay	b2c68c9ea3	Set default log levels	2017-02-20 14:30:58 -08:00
Kevin Serrano	bf9d1f405f	add waits between notices.	2017-02-20 13:41:46 -08:00
Dan Finlay	8aca5bf4b5	Add debug logging to ui routing logic.	2017-02-20 13:14:12 -08:00
Kevin Serrano	415b9b245c	Fix typo.	2017-02-20 12:59:31 -08:00
Kevin Serrano	c934f96651	Re-enable notices on dev.	2017-02-20 12:59:12 -08:00
Kevin Serrano	b3862c6f2e	Merge pull request #1137 from MetaMask/AddPersonalSignMethod ... Add personal_sign and personal_ecRecover support	2017-02-20 12:32:15 -08:00
Dan Finlay	42a58918d0	Add personal_sign and personal_ecRecover support	2017-02-20 11:46:43 -08:00
Dan Finlay	6b56d6ba98	Broke hex decimal input into its own component ... Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again.	2017-02-17 12:46:08 -08:00
Kevin Serrano	89af0ef408	Change state to props, add modifiable fields.	2017-02-17 12:08:54 -08:00
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