1161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	07e5f94da8	Merge pull request #581 from MetaMask/i484PersistPendingSignatures ... Fix bug where unconfirmed message sig is lost when locked.	2016-08-24 16:20:59 -07:00
Dan Finlay	eee08457e5	Merge branch 'master' into i484PersistPendingSignatures	2016-08-24 16:15:43 -07:00
Dan Finlay	c8c77aa8bd	Merge pull request #579 from MetaMask/api-test-fix ... Api test fix	2016-08-24 16:15:08 -07:00
Kevin Serrano	06b5e7f527	Merge branch 'master' into api-test-fix	2016-08-24 16:09:51 -07:00
Kevin Serrano	88671466c6	Merge pull request #580 from MetaMask/FixEmptySignBug ... Fix empty sign bug	2016-08-24 16:07:38 -07:00
Dan Finlay	15c8680e21	Bump changelog	2016-08-24 16:02:47 -07:00
Dan Finlay	3febbdae57	Linted	2016-08-24 16:02:22 -07:00
Dan Finlay	abb5b2013d	Fix bug where unconfirmed message sig is lost when locked. ... Fixes #484 Adds unsigned messages to the in-memory message list before showing the unlock message.	2016-08-24 15:58:08 -07:00
Dan Finlay	8c06463e80	Linted	2016-08-24 15:46:31 -07:00
Dan Finlay	6041d6157a	Bump changelog	2016-08-24 15:43:42 -07:00
Dan Finlay	44ff75c7e1	Improve msg signing padding	2016-08-24 15:43:00 -07:00
Dan Finlay	4f78ae56b2	Fix empty sign message bug	2016-08-24 15:40:40 -07:00
Dan Finlay	0fd955d636	Add pending sign msg development state	2016-08-24 15:40:22 -07:00
Kevin Serrano	af375d7f8a	Naming issue.	2016-08-24 14:02:51 -07:00
Kevin Serrano	c82a494b4b	Implement usage of nock.	2016-08-24 13:58:50 -07:00
Kevin Serrano	e42b35398b	Changelog change.	2016-08-24 13:28:31 -07:00
Kevin Serrano	061fec1849	Now calls API functions with mock options.	2016-08-24 13:28:24 -07:00
Kevin Serrano	d3d634d09c	Added mock option to function.	2016-08-24 13:28:06 -07:00
Kevin Serrano	55745c5980	Merge pull request #575 from MetaMask/shortcuts ... Shortcut to open MetaMask	2016-08-24 11:40:02 -07:00
Kevin Serrano	c27ad468d1	Clarify shortcut.	2016-08-24 11:24:46 -07:00
Kevin Serrano	cf5b8ba388	Change shortcut again to Ctrl+Alt+M	2016-08-24 11:15:03 -07:00
Kevin Serrano	1444f5451f	Change shortcut to Alt+M	2016-08-24 10:25:59 -07:00
Kevin Serrano	2a9b271703	Update changelog.	2016-08-23 16:54:25 -07:00
Kevin Serrano	9328e96d80	Add shortcut for opening MetaMask.	2016-08-23 16:53:05 -07:00
Dan Finlay	a0c7b0b1a2	Merge pull request #574 from MetaMask/fox-sub ... Sub static fox image when WebGL isn't supported	2016-08-23 16:01:36 -07:00
Kevin Serrano	304b5b0b20	Remove gulp dependency.	2016-08-23 15:56:17 -07:00
Kevin Serrano	d2c4227a31	Modify package.json.	2016-08-23 15:43:16 -07:00
Kevin Serrano	4bceda37a8	Merge branch 'master' into fox-sub	2016-08-23 14:51:09 -07:00
Kevin Serrano	00e8db31ce	Update package.json	2016-08-23 14:47:37 -07:00
Kevin Serrano	050d0aecc6	Changelog.	2016-08-23 14:32:47 -07:00
Kevin Serrano	6363a80b49	Linting.	2016-08-23 14:32:12 -07:00
Kevin Serrano	5168232481	Created option to pass in static file for fallback for logo.	2016-08-23 14:11:25 -07:00
kumavis	9dad3a5917	Merge pull request #573 from MetaMask/kumavis-patch-1 ... inpage - cleanContextForImports fix	2016-08-22 19:33:26 -07:00
kumavis	c97866e367	Merge branch 'master' into kumavis-patch-1	2016-08-22 19:23:01 -07:00
kumavis	07927b5798	Merge pull request #558 from MetaMask/i390-TransactionLimit ... Enforce transaction log limit	2016-08-22 19:22:31 -07:00
kumavis	8b9999b71e	inpage - cleanContextForImports fix ... set to undefined instead of deleting updates #447	2016-08-22 19:22:12 -07:00
kumavis	5c9ca21ba3	Merge branch 'master' into i390-TransactionLimit	2016-08-22 19:19:53 -07:00
kumavis	f9c58c0746	Merge pull request #572 from MetaMask/i479 ... inpage provider - reassign incomming ids	2016-08-22 19:17:18 -07:00
kumavis	2f01ec5be2	Merge branch 'master' into i479	2016-08-22 19:14:58 -07:00
kumavis	b8077983d6	inpage provider - reassign incomming ids	2016-08-22 18:59:15 -07:00
Dan Finlay	a0d0245343	Add gulp tasks as npm scripts	2016-08-22 17:37:23 -07:00
Dan Finlay	5d24621b56	More linting	2016-08-22 17:37:16 -07:00
Dan Finlay	17f3f90d80	Linted	2016-08-22 17:21:54 -07:00
Dan Finlay	b79a52c71c	Merge pull request #571 from MetaMask/chinese-local ... Chinese and Spanish localization	2016-08-22 16:43:49 -07:00
Dan Finlay	f57cbe59fc	Removed view more button, added account info button. ... Also: - Also fixed bug that caused React warning when rendering the tx history. - Renamed 'Transactions' to 'History', since it now has more than that.	2016-08-22 14:36:21 -07:00
Kevin Serrano	bc2abd0a78	First part of chinese translation.	2016-08-22 14:11:32 -07:00
Kevin Serrano	18aef9570f	Add spanish locales.	2016-08-22 14:07:02 -07:00
Dan Finlay	c223ba2e00	Add builds.zip to gitignore	2016-08-22 11:59:26 -07:00
Dan Finlay	3d451ddf3e	Merge branch 'master' into i390-TransactionLimit	2016-08-22 11:59:08 -07:00
Kevin Serrano	cec88cc9ac	Merge branch 'master' into fox-sub	2016-08-22 11:58:59 -07:00