7542 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bruno Barbieri	0f2a5ece48	Update config.yml	2018-07-06 00:38:13 -04:00
Bruno Barbieri	e29804224a	Fix indentation	2018-07-06 00:33:19 -04:00
Bruno Barbieri	ca09a0be83	Update config.yml	2018-07-06 00:32:12 -04:00
Bruno Barbieri	9ca9e90e4c	Update config.yml	2018-07-06 00:22:40 -04:00
Bruno Barbieri	65a349dd30	Update config.yml	2018-07-06 00:21:04 -04:00
Bruno Barbieri	76912c8a0d	use sudo to install npm	2018-07-06 00:15:29 -04:00
Bruno Barbieri	1387f1c8c2	Another update	2018-07-06 00:14:33 -04:00
Bruno Barbieri	816b3a9d11	use package-lock only for the initial restore	2018-07-05 23:26:12 -04:00
Bruno Barbieri	170d05d2e6	Proper caching of node_modules	2018-07-05 22:11:58 -04:00
brunobar79	6b2511f94f	UI refactor	2018-07-05 20:59:31 -04:00
Dan Finlay	484a103099	Merge pull request #4738 from MetaMask/bmd/contrib-guidelines ... update contributing.md	2018-07-05 17:52:45 -07:00
Bobby Dresser	29b3da6668	update contributing.md	2018-07-05 17:52:26 -04:00
brunobar79	6c2730f243	Refactor UI	2018-07-05 17:45:28 -04:00
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
Dan J Miller	6595f84d07	Merge pull request #4648 from MetaMask/update-import-from-seed-screen ... Update import from seed screen on new ui.	2018-07-05 16:26:21 -02:30
Dan J Miller	d3920007fa	Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui ... Improve send token error ux.	2018-07-05 16:25:59 -02:30
Dan	f006cbf2ce	Delete old restore vault file.	2018-07-05 14:44:08 -02:30
Whymarrh Whitby	60857f94ad	Merge pull request #4733 from whymarrh/fix-setstate-warnings ... Fix setState warnings in components using TokenTracker	2018-07-05 13:59:46 -02:30
Whymarrh Whitby	e59e92e028	Merge pull request #4734 from whymarrh/txlistitem-setstate-warning ... Prevent calling setState in TxListItem after unmount	2018-07-05 13:59:25 -02:30
Dan J Miller	3c75be04a0	Merge pull request #4617 from TrejGun/fix-new-line ... fix white spaces in signature	2018-07-05 13:55:18 -02:30
Dan J Miller	b0214cbde3	Merge pull request #4735 from whymarrh/restore-vault-focus ... Don't persist the seed phrase in the old UI restore flow	2018-07-05 13:47:35 -02:30
Whymarrh Whitby	2298daa53e	Prevent calling setState in TxListItem after unmount	2018-07-05 13:17:53 -02:30
Whymarrh Whitby	46ee290114	Don't persist the seed phrase in the old UI restore flow	2018-07-05 13:07:38 -02:30
Dan J Miller	d4bc943b01	Merge pull request #4686 from MetaMask/tweak-token-list-amount-style ... Ensures token list amount is in its own row.	2018-07-05 12:39:26 -02:30
Whymarrh Whitby	783559f94e	Don't update token balances after tracker is stopped	2018-07-05 10:54:51 -02:30
Whymarrh Whitby	0116ea9b95	Remove TokenTracker listeners when unmounting component	2018-07-05 10:54:51 -02:30
Dan	5d721665d3	Ensures token list amount is in its own row.	2018-07-05 08:07:41 -02:30
Dan J Miller	46cda26f3b	Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui ... Use background gas price estimation method in new ui.	2018-07-05 08:01:03 -02:30
TrejGun	94d1d846fb	Merge branch 'develop' into contextTypes ... # Conflicts: # ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js	2018-07-05 11:34:13 +08:00
trejgun	c94f639de5	convert contextType to static prop for refactored components	2018-07-05 11:33:34 +08:00
TrejGun	b427743ab8	fix classname	2018-07-05 11:21:27 +08:00
Анна	90934bca46	Merge branch 'develop' into to-autocomplete	2018-07-05 11:15:28 +08:00
Dan	7d7662191a	Improve error and promise resolution handling in action.js updateGasData().	2018-07-04 21:47:19 -02:30
Dan	f262f0ea64	Update import from seed screen on new ui.	2018-07-04 21:21:12 -02:30
Dan J Miller	fd218142ac	Merge pull request #4721 from MetaMask/i4666-gasLimit ... fixes #4666 getGasLimit and getGasPrice removed and replaced	2018-07-04 17:22:14 -02:30
Dan	c47a4ce2c9	Update new-ui-send integration tests to always explicitly set gas price. (e2e tests handle auto-setting and defaults)	2018-07-04 16:44:56 -02:30
Dan	0796fc58e4	Improve send token error ux.	2018-07-04 16:09:29 -02:30
Dan Finlay	68e1f22193	Merge pull request #4405 from PortalNetwork/portal-metamask ... Integration ENS with IPFS	2018-07-04 11:05:16 -07:00
PhyrexTsai	f38dc03b27	Merge pull request #4 from brunobar79/portal-metamask-lint-fix ... Lint fix for Integration ENS with IPFS	2018-07-04 09:06:10 +08: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
Sara Reynolds	6bc7647c05	fixes 4666	2018-07-03 16:05:20 -07:00
Sara Reynolds	d3c64358c5	:qw ... :wq q	2018-07-03 16:05:20 -07: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
Dan	7babacf062	Remove unnecessary anonymous function call in actions.js gas estimation.	2018-07-03 17:24:21 -02:30
brunobar79	9d3f2435e5	lint fix	2018-07-03 15:46:15 -04:00
kumavis	b3b33b4697	Update .eslintignore	2018-07-03 12:43:14 -07:00