7220 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
brunobar79	ba5cde0995	move strings to localization file	2018-07-05 17:04:36 -04:00
brunobar79	313090efcc	added message for non-chrome browsers	2018-07-05 16:11:41 -04:00
brunobar79	986bb74501	package.json updated and tests passing	2018-07-03 20:24:21 -04:00
brunobar79	d382f89989	tests are passing	2018-07-03 20:21:01 -04:00
brunobar79	46498af9b5	Merge branch 'develop' into initial-trezor-support	2018-07-03 18:04:51 -04:00
brunobar79	a279748c2e	package-lock update	2018-07-03 17:56:30 -04:00
kumavis	7d882fe491	Merge pull request #4719 from MetaMask/kumavis-patch-3 ... lint - ignore test-builds dir	2018-07-03 13:47:57 -07:00
brunobar79	9d3f2435e5	lint fix	2018-07-03 15:46:15 -04:00
kumavis	b3b33b4697	Update .eslintignore	2018-07-03 12:43:14 -07:00
brunobar79	3837c2ddd7	fix merge conflicts	2018-07-03 15:41:18 -04:00
Bruno Barbieri	e467eda4f7	Merge pull request #4718 from MetaMask/ignore-superstatic-vulnerability ... ignore lodash vulnerability	2018-07-03 09:08:12 -10:00
Dan J Miller	a049627752	Merge pull request #4716 from MetaMask/i4663-clearErrorMessages ... fixes #4663 - Clear Error Messages when Importing Accounts are Successful	2018-07-03 16:03:55 -02:30
Dan Finlay	2e9bd7e9d1	Merge pull request #4717 from MetaMask/chrome-promise-bugfix ... Conditionally use Promise-based extension API when creating windows	2018-07-03 11:16:35 -07:00
Dan J Miller	8def5281b4	Merge pull request #4654 from TrejGun/bignumber ... fixes #4307 BigNumber casting issue	2018-07-03 15:18:04 -02:30
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
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
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
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
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
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
brunobar79	85fd75c21f	update package-lock.json	2018-07-02 17:03:20 -04: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