6758 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	2d4d77b17d	docs - jsdoc - fix syntax	2018-05-18 11:52:28 -07:00
kumavis	cc6265fe0a	ci - add prep-docs job	2018-05-18 11:50:46 -07:00
kumavis	8fe19a16c5	ci - add job-publish-release	2018-05-18 11:29:10 -07:00
kumavis	2e2ef97fb5	ci - rename job-publish to job-publish-prerelease	2018-05-18 11:10:42 -07:00
kumavis	a78603c218	ci - clean - whitespace fix	2018-05-18 11:09:07 -07:00
kumavis	666c1f1b30	token-util - warn via loglevel on token lookup failure	2018-05-18 10:51:49 -07:00
simon	22753d96fd	Added trailing comma for eslint	2018-05-18 16:11:46 +02:00
simon	41502cb384	Added adyen.com to blacklisted domains because postMessages are blocking card encryption	2018-05-18 15:43:27 +02:00
Thomas	f279a8e61a	signMessage and signPersonalMessage	2018-05-17 16:26:08 -07:00
Whymarrh Whitby	67310e151e	Fix migration 026 to produce the correct shape for state.identities	2018-05-17 13:35:38 -02:30
Whymarrh Whitby	e546f4b904	Update MetaMaskController vault restoration test for new KC api	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	805c6158a4	Update eth-keyring-controller dependency	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	2d13fac476	Add migration to move identities from KeyringController	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	50af02e74b	Add test case for PreferencesController#setAccountLabel	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	c54e4c7191	Add PreferencesController#setAddresses to update ids	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	cbe4d0d88c	Update AddressBookController to read from preferences store	2018-05-17 12:57:39 -02:30
Whymarrh Whitby	924cc1fcf7	Move setAccountLabel into PreferencesController	2018-05-17 12:57:39 -02:30
kumavis	3084dc47d1	recent-blocks - fix backfill blockNumber tracking	2018-05-17 00:13:20 -07:00
Thomas	770379c3da	Merge branch 'develop' into testing	2018-05-17 00:01:36 -07:00
kumavis	eaa5a48c91	test - unit - network - get providerProxy via public method	2018-05-16 23:54:17 -07:00
kumavis	ae53fa09b4	deps - bump some bugfixes	2018-05-16 23:53:36 -07:00
kumavis	41c04ef721	controllers - recent-blocks - fix pifyd setTimeout args	2018-05-16 23:13:25 -07:00
Thomas	5e80bc4cb9	Merge branch 'develop' into testing	2018-05-16 22:47:07 -07:00
kumavis	08dc238c9f	deps - fix incorrect dep paths and versions	2018-05-16 22:46:11 -07:00
Thomas	d9be7f989a	Merge branch 'testing' of https://github.com/tmashuang/metamask-extension into testing	2018-05-16 22:44:51 -07:00
kumavis	f9074a5721	docs - remove references to web3-provider-engine	2018-05-16 21:20:50 -07:00
kumavis	c2a685eb2f	deps - remove web3-provider-engine	2018-05-16 21:20:35 -07:00
kumavis	32b3b8f2a7	controllers - balance - update for eth-block-tracker@4	2018-05-16 21:16:05 -07:00
kumavis	623533ab15	recent-blocks - update for eth-block-tracker@4	2018-05-16 21:13:53 -07:00
kumavis	3e04840a71	remove unused events-proxy, was replaced with module swappable-obj-proxy	2018-05-16 21:10:41 -07:00
kumavis	b6eff15bd2	lint fix	2018-05-16 21:08:19 -07:00
kumavis	088d7930e0	network - create provider and block-tracker via json-rpc-engine	2018-05-16 20:46:34 -07:00
Thomas	f2815d3121	Adjustments for previous PR	2018-05-16 19:12:03 -07:00
Bruno	b0dcdc30fa	remove fix header height	2018-05-16 18:51:55 -04:00
Thomas	77e13640b4	Testing timeouts	2018-05-16 15:03:53 -07:00
kumavis	708422432c	Merge pull request #4266 from MetaMask/send-screen-detailed-QA-checklist ... Adds detailed QA checklist for the New UI send screen.	2018-05-16 14:26:47 -07:00
kumavis	f397002bf8	Merge pull request #4235 from scsaba/transaction-history-timestamps ... Transaction history timestamps	2018-05-16 14:20:08 -07:00
kumavis	44f31f9a7e	Merge branch 'develop' of github.com:MetaMask/metamask-extension into scsaba-transaction-history-timestamps	2018-05-16 13:56:32 -07:00
kumavis	76c8cb3d7b	Merge pull request #4146 from MetaMask/sentry-error-like2 ... sentry - add helper to fully rewrite all error messages	2018-05-16 13:54:15 -07:00
kumavis	8e1cad5ff6	tx-state-history-helper - use more readable Date.now method	2018-05-16 13:05:07 -07:00
kumavis	4be681f447	Merge pull request #4255 from MetaMask/i4233-dropdowns ... Fix account and network dropdowns in confirm screen	2018-05-16 13:02:27 -07:00
kumavis	d722aa7f0c	Merge pull request #4155 from MetaMask/network-controller-remove-setNetworkEndpoints ... Network controller - remove dead code	2018-05-16 13:01:36 -07:00
kumavis	ff91ef96ef	ui - unlock - remove setNetworkEndpoints calls from new unlock screen	2018-05-16 12:35:43 -07:00
kumavis	c6f822ad45	ui - remove files accidently added by bad merge	2018-05-16 12:29:57 -07:00
kumavis	d62fc22611	network - remove debugging console.log	2018-05-16 11:59:50 -07:00
kumavis	c27d9162d7	Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints	2018-05-16 11:57:07 -07:00
Dan	5a7e98b3a9	Adds description to send-screen-QA-checklist.md	2018-05-16 12:45:06 -02:30
Dan	86c73eec5c	Adds detailed QA checklist for the New UI send screen.	2018-05-16 12:42:05 -02:30
Thomas	517be35ab6	Merge branch 'develop' into e2e-tests	2018-05-14 17:19:44 -07:00
Thomas	cd42d18203	Merge e2e tests into one	2018-05-14 17:17:36 -07:00