7544 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kumavis	43e805805e	diagnostics - temporarily disable	2018-06-13 17:40:28 -07:00
kumavis	66c77dc2bd	Merge pull request #4570 from MetaMask/persistence-stream-fix ... background - persistence pipeline - fix persistence bug	2018-06-13 17:27:50 -07:00
bobby dresser	8cb5f57c30	Merge pull request #4550 from MetaMask/bmd/sign-warning-helplink ... add help link to eth_sign warning	2018-06-13 16:59:17 -07:00
kumavis	86f7692c04	changelog - add note on persistence bug	2018-06-13 16:54:05 -07:00
kumavis	7b414f3ed0	background - persistence pipeline - fix persistence bug	2018-06-13 16:45:18 -07:00
Kevin Serrano	4481c7be44	Add changelog item.	2018-06-13 13:52:34 -07:00
Kevin Serrano	9c5a9b9b7f	Add phishing notice.	2018-06-13 13:51:39 -07:00
Kevin Serrano	451d05a400	Merge pull request #4560 from MetaMask/nonce-tracker-mutex-fix ... changelog - add note on nonce-lock mutex fix	2018-06-13 09:53:17 -07:00
Dan	5995b6d68d	ENS name revalidates on network change.	2018-06-13 09:26:21 -02:30
kumavis	5032d6e4c5	Merge branch 'develop' into nonce-tracker-mutex-fix	2018-06-12 23:22:09 -07:00
Bruno	704e2a21f8	clean up	2018-06-13 02:09:25 -04:00
Bruno	bb4cc72646	fix merge conflicts	2018-06-13 02:01:47 -04:00
Bruno	b6980eed87	Merge branch 'develop' of git://github.com/Metamask/metamask-extension into develop	2018-06-13 01:55:35 -04:00
Bruno	4e7d92ec8f	Merge branch 'develop' of https://github.com/brunobar79/metamask-extension into develop	2018-06-13 01:49:41 -04:00
Bruno	fe3d81cfd8	upgrade eth-trezor-keyring	2018-06-13 01:44:53 -04:00
Bruno	8763ea898e	move TrezorKeyring to its own package	2018-06-13 01:32:13 -04:00
Bruno	d4201ae1cc	added support for signPersonalMessage	2018-06-13 00:22:04 -04:00
Dan Finlay	73a9aaa833	Merge pull request #4558 from MetaMask/stop-reload-on-network-change ... Stop reload on network change	2018-06-12 15:48:17 -07:00
Erik Marks	bb201d7c4a	Merge branch 'develop' into stop-reload-on-network-change	2018-06-12 13:39:21 -07:00
Erik Marks	6ba70a039a	update changelog	2018-06-12 13:37:37 -07:00
Erik Marks	be505ddf6c	undo package.json and package-lock.json changes	2018-06-12 13:30:50 -07:00
kumavis	013d8451c8	changelog - add note on nonce-lock mutex fix	2018-06-12 13:08:28 -07:00
kumavis	0740dd6a5b	Merge pull request #4557 from MetaMask/nonce-tracker-mutex-fix ... Bug: Mutex locks not released on error	2018-06-12 13:07:19 -07:00
kumavis	604289c96c	controllers - transaction - prefer log over console	2018-06-12 12:08:06 -07:00
kumavis	177cc3f280	metamask - ensure all nonce locks are released	2018-06-12 11:51:35 -07:00
Dan Finlay	77dc75c9b1	Merge pull request #4556 from MetaMask/WatchTestReload ... Add script for auto-re-running unit tests on changes	2018-06-12 11:38:28 -07:00
kumavis	8f93e34175	nonce-tracker - wrap nonce calculations in try-catch and release lock on error	2018-06-12 11:31:26 -07:00
Dan Finlay	9c77af1ce6	Add script for auto-re-running tests on change ... `npm run watch:test:unit` will re-run the unit test suite whenever a file in `app`, `ui`, or `test` changes.	2018-06-12 11:13:44 -07:00
Erik Marks	b982961381	removed auto-reload.js, moved global web3 export to inpage.js	2018-06-12 11:04:37 -07:00
Whymarrh Whitby	f08442e266	Merge pull request #4554 from whymarrh/fix-e2e-profile-path ... Fix temp Chrome profile path used for e2e tests	2018-06-12 15:14:13 -02:30
Whymarrh Whitby	c56ed16891	Fix e2e test Chrome profile paths	2018-06-12 14:11:20 -02:30
Erik Marks	f461bd8812	wip	2018-06-12 09:28:50 -07:00
Dan Finlay	b24efcb1cd	Make account import tests much more specific ... However, they no longer seem to work. I'm unclear why this test is failing. The private key being provided should be valid.	2018-06-11 14:58:05 -07:00
Bobby Dresser	4196b16f06	add help link to eth_sign warning	2018-06-11 14:28:57 -07:00
Dan J Miller	b7a469681b	Merge pull request #4535 from MetaMask/i4508-fix-gas-edit-confirm-screen ... Fix gas limit editing on confirm screen	2018-06-11 10:39:57 -02:30
Bruno	999b6bd24a	clean up	2018-06-11 01:58:19 -04:00
Bruno	68d97211ff	sign transactions is pretty close	2018-06-11 01:52:41 -04:00
Bruno	d1880073f6	balances working	2018-06-10 21:10:22 -04:00
Bruno	f6b27fa9eb	add account working	2018-06-10 19:02:54 -04:00
Bruno	f5f66f59d7	clean up	2018-06-10 18:48:42 -04:00
Bruno	8c4d58aa45	initial trezor support	2018-06-10 03:52:32 -04:00
kumavis	368fe229c2	changelog - version fix	2018-06-08 21:04:20 -07:00
Dan	049071a743	Access correct property from state in confirm screen components gatherTxMeta()	2018-06-08 12:52:38 -02:30
Jenny Pollack	93bdfc0bba	changelog 4270	2018-06-07 14:15:02 -07:00
Jenny Pollack	e7c2710a55	Merge branch 'develop' into save-brave	2018-06-07 14:10:56 -07:00
Dan Finlay	385927a1b9	Improve private key import tests	2018-06-07 13:34:10 -07:00
Dan Finlay	b7fe4b820d	Improve test formatting	2018-06-07 10:54:19 -07:00
Dan Finlay	c0d2dab28b	Merge pull request #4523 from MetaMask/i4462-FixResetBug ... Fix bug where reset account would not work.	2018-06-07 10:47:34 -07:00
Jenny Pollack	fd8bcc9cb1	lint	2018-06-06 22:08:32 -07:00
Dan J Miller	988283778a	Merge pull request #4090 from MetaMask/i3725-refactor-send-component- ... I3725 Refactor Send Component	2018-06-07 00:50:16 -02:30