8024 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
brunobar79	160bc4daa4	ignore lodash vulnerability	2018-07-03 13:46:50 -04:00
Alexander Tseung	3fd5af636f	Merge pull request #4633 from MetaMask/i4580-import-account-errors ... Show all errors on account creation screen.	2018-07-03 07:43:40 -10:00
bitpshr	badf0ce314	Conditionally use Promise-based extension API when creating windows	2018-07-03 13:33:13 -04:00
Dan J Miller	4bdd59b055	Merge pull request #4699 from TrejGun/removeLeadingZeroes ... move removeLeadingZeroes to utils, add test	2018-07-03 15:01:48 -02:30
brunobar79	3290421e2f	fix merge conflicts	2018-07-03 13:31:30 -04:00
Esteban MIno	0494b2fc8a	Merge branch 'develop' into detectTokenFeature	2018-07-03 13:23:15 -04:00
Esteban MIno	03fd4355af	passtest-lint	2018-07-03 12:53:06 -04:00
Sara Reynolds	d126887bc3	fixes 4663	2018-07-03 09:50:59 -07:00
kumavis	1f0cf11af1	Merge pull request #4712 from MetaMask/lint-fix ... Lint - Lint all the things (without conflicts!)	2018-07-03 09:40:25 -07:00
kumavis	b75abfac60	test - e2e - fix missing import	2018-07-02 23:54:18 -07:00
kumavis	9f29fa5c9a	Merge branch 'develop' into network-remove-provider-engine	2018-07-02 21:58:29 -07:00
kumavis	c30ee58e61	Merge pull request #4711 from alextsg/network-remove-provider-engine ... Fix notice screen incorrectly disabling Accept button after multiple …	2018-07-02 21:57:13 -07:00
trejgun	1f6bf0a80d	fixes #4664	2018-07-03 10:34:39 +08:00
brunobar79	53f1072ff4	fix contract-test	2018-07-02 22:20:51 -04:00
brunobar79	4b398701c1	fix unit tests	2018-07-02 21:03:34 -04:00
brunobar79	c734e486a0	fix tests	2018-07-02 20:21:27 -04:00
brunobar79	b4107a505b	fix warning for new-ui screen tests	2018-07-02 20:13:04 -04:00
brunobar79	0da41263ac	fix warning for unit tests	2018-07-02 20:12:50 -04:00
brunobar79	390f86113a	fix test/mascara.conf.js warnings	2018-07-02 19:53:45 -04:00
brunobar79	04743afb2d	fix warnings for integration tests	2018-07-02 19:52:49 -04:00
brunobar79	cb71896a8f	fix warnings for e2e tests	2018-07-02 19:51:27 -04:00
Alexander Tseung	86e95b283b	Fix notice screen incorrectly disabling Accept button after multiple notices	2018-07-02 16:48:26 -07:00
brunobar79	376188ffc5	fix notices warning	2018-07-02 19:46:42 -04:00
Esteban Miño	4d9ef0dd7f	Merge pull request #4709 from MetaMask/pointMasterContractMetadata ... point eth-contract-metadata to repo master	2018-07-02 19:38:50 -04:00
brunobar79	8c032323a2	add QUnit to eslint globals	2018-07-02 19:37:21 -04:00
brunobar79	bbc0d6f48d	fix gentests.js	2018-07-02 19:36:26 -04:00
brunobar79	03ff8a7cfa	fix mascara warnings	2018-07-02 19:36:16 -04:00
brunobar79	35d83c478a	fix mascara/example/server.js warnings	2018-07-02 19:31:03 -04:00
brunobar79	ce0232fa1e	fix gentests.js warnings	2018-07-02 19:24:24 -04:00
kumavis	9f11042d72	test - e2e - move timings	2018-07-02 16:03:53 -07:00
brunobar79	73b6d5ff95	fix version-bump.js	2018-07-02 18:59:02 -04:00
brunobar79	26e4f87ce4	fix verify-locale-strings.js	2018-07-02 18:58:31 -04:00
brunobar79	3c1471d6c6	fix ui-dev.js warnings	2018-07-02 18:57:25 -04:00
brunobar79	42feca1f27	fix sourcemap-validator.js warnings	2018-07-02 18:56:51 -04:00
brunobar79	ffaca7971a	fix mock-dev.js warnings	2018-07-02 18:50:47 -04:00
brunobar79	8fbcd95d53	fix beefy.js warnings	2018-07-02 18:50:07 -04:00
brunobar79	0fad48592c	add $ to globals	2018-07-02 18:49:49 -04:00
brunobar79	a8f745f9fe	eslint --fix .	2018-07-02 18:49:33 -04:00
kumavis	0ada37ead7	test - e2e-beta - update some api calls	2018-07-02 15:46:33 -07:00
brunobar79	cc11a62397	remove gulp eslint and cleanup gulpfile	2018-07-02 18:35:53 -04:00
brunobar79	61fcec78f8	update eslint rules and paths	2018-07-02 18:35:30 -04:00
Esteban MIno	4b45dd4ed0	point eth-contract-metadata to repo master	2018-07-02 18:29:22 -04:00
kumavis	3111ae3a69	dep - automated package-lock fixes	2018-07-02 14:57:23 -07:00
brunobar79	85fd75c21f	update package-lock.json	2018-07-02 17:03:20 -04:00
kumavis	3163090e0b	deps - update package-lock	2018-07-02 13:55:54 -07:00
kumavis	a89902c170	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-remove-provider-engine	2018-07-02 13:54:05 -07:00
brunobar79	9b0bc67066	fix merge conflicts	2018-07-02 15:29:26 -04:00
brunobar79	f19ffaf08d	move hardcoded strings to localization file	2018-07-02 15:16:05 -04:00
brunobar79	86a8c98148	always open connect hardware in full screen mode	2018-07-02 15:14:57 -04:00
brunobar79	317c3084df	allow to open specific route in fullscreen mode	2018-07-02 15:14:31 -04:00