388 Commits

Author	SHA1	Message	Date
Dan Finlay	351c8e2086	Merge branch 'master' into i328-MultiVault	2016-10-20 14:02:24 -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	090959470b	Add note about callback param to sync method warning	2016-10-19 15:16: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
Kevin Serrano	725d503f68	Remove unused crypto dependencies.	2016-10-19 14:06:48 -07:00
Kevin Serrano	17506fe14f	Merge in crypto.	2016-10-19 11:17:29 -07:00
Dan Finlay	cc23158bfe	Wait for first metamask data to establish ping-pong stream. ... Prevents infinite reload loops when dapps take too long to load. Fixes #746.	2016-10-18 13:51:50 -07:00
Dan Finlay	827d7553fc	Restore hex prefix to gas price	2016-10-17 13:05:45 -07:00
Dan Finlay	91f43fa213	Increase gas estimate by 100000 wei ... To prevent minor gas estimation errors, probably usually related to operating on dynamic state. Fixes #738.	2016-10-17 12:47:37 -07:00
Kevin Serrano	bc6092e111	Merge branch 'master' into i735-xmlfix	2016-10-17 10:25:00 -07:00
Kevin Serrano	0d495372da	Lint.	2016-10-15 15:41:24 -07:00
Kevin Serrano	8a5eacd35f	Prevent XML from web3 injections.	2016-10-15 15:33:49 -07:00
Kevin Serrano	1481a3ef8e	Initial work on UI side	2016-10-15 10:48:12 -07:00
Frankie	35232c5e29	Fix for linting	2016-10-13 18:08:15 -07:00
Frankie	aace26c4bd	Create callback and Clean-up details	2016-10-13 16:53:32 -07:00
Frankie	67eba9f542	Specify base 10 in bignumber	2016-10-13 16:04:23 -07:00
Frankie	b200f74d5f	Merge branch 'master' into i#495CustomGasField	2016-10-13 15:17:30 -07:00
Frankie	c400f7c0f6	Fix gasPrice range	2016-10-13 15:10:29 -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
kumavis	465cff78c3	Merge branch 'master' into i695-dapp-reload	2016-10-12 13:49:18 -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	229d95956b	Merge branch 'master' into i#495CustomGasField	2016-10-11 16:19:13 -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
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	ed03b89e26	Move tos hash logic to build phase. Create dynamic global variables based on build.	2016-10-11 14:32:03 -07:00
Frankie	3a610f2c06	Merge branch 'master' into i#495CustomGasField	2016-10-10 18:18:07 -07:00
Frankie	e1b78da3e6	Add custom gas field to send page	2016-10-10 18:17:56 -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	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
Dan Finlay	f21170c7c3	Add tolerance for sending from mixed-case addresses. ... We had to convert to lower case, and also had to modify the new provider-engine sanitizer to tolerate mixed case addresses. Fixes #707	2016-10-05 15:26:56 -07:00
Dan Finlay	d02b2c4b4a	Correct async link	2016-10-05 11:10:39 -07:00
Dan Finlay	f9eba9d7e5	Make popup a little taller ... For some reason the popup was often cutting off the bottom buttons of the UI. We should look at that more carefully later perhaps, but especially since we're considering moving off the popup, I'm just fixing it by making it taller for now.	2016-10-04 13:10:28 -07:00