6778 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Frankie	004d4cc3c7	Merge pull request #4328 from MetaMask/i4325-yarnignore ... Remove yarn.lock	2018-05-21 14:52:53 -07:00
Kevin Serrano	610fa8f6b3	It tried to get away, but justice must be served.	2018-05-21 14:36:21 -07:00
Frankie	2c8d1c0e51	Merge pull request #4326 from MetaMask/Jabher-develop ... Deps - bump extensionizer	2018-05-21 14:34:14 -07:00
Kevin Serrano	0eec30e0f4	Merge pull request #4329 from MetaMask/Trigalti-develop ... Injection Blacklist: adyen	2018-05-21 14:32:51 -07:00
kumavis	9929f89c6e	Merge pull request #4316 from MetaMask/fix-signature-request ... Fix signature request header text	2018-05-21 14:18:55 -07:00
kumavis	f19d8a5905	Merge branch 'develop' of https://github.com/Trigalti/metamask-extension into Trigalti-develop	2018-05-21 14:14:03 -07:00
Kevin Serrano	4ac233b1fd	Please, this is my third PR already, stop adding extra baggage. Also, removed the yarn.lock.	2018-05-21 14:07:29 -07:00
kumavis	a1d2813f8f	Merge pull request #4273 from brunobar79/fix-new-ui-popup-header ... Remove fix modal header height	2018-05-21 14:07:06 -07:00
kumavis	45ed187bfe	Merge pull request #4240 from MetaMask/EnhancePortGuide ... Enhance guide to porting to new platform	2018-05-21 14:05:49 -07:00
kumavis	d45fe6fc72	Merge branch 'develop' of https://github.com/Jabher/metamask-extension into Jabher-develop	2018-05-21 13:59:23 -07:00
kumavis	08d95bbafa	Merge pull request #4034 from whymarrh/account-nicknames ... Move account names out of KeyringController	2018-05-21 13:44:07 -07:00
tmashuang	554a10f17e	Merge branch 'develop' into testing	2018-05-21 13:05:24 -07:00
kumavis	77b4a9f82c	CI - remove node security test as blocker for builds	2018-05-21 10:58:58 -07:00
kumavis	b426b5e58c	Merge pull request #4278 from MetaMask/e2e-tests ... E2e tests	2018-05-21 10:53:55 -07:00
tmashuang	13ebb0b455	Moved loose some loose test files to sub folders	2018-05-21 05:59:26 -07:00
Alexander Tseung	c4e75a7075	Fix tests	2018-05-20 14:08:45 -07:00
Alexander Tseung	646545551c	Fix signature request header text	2018-05-20 13:01:31 -07:00
Alexander Tseung	4f6b53c1aa	Update designs for Add Token screen	2018-05-19 23:04:19 -07:00
kumavis	59c9852999	ci - add docs publish to job-publish-release	2018-05-18 14:03:02 -07:00
Dan Finlay	713c77db54	Merge pull request #4199 from MetaMask/i3487-provider-errors ... RPC error middleware for json-rpc-engine	2018-05-18 11:57:29 -07:00
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