3728 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kevin Serrano	6a9d40c558	Add test for blacklister.	2017-07-26 15:24:57 -07:00
Dan Finlay	bc65484e1b	Remove object spread syntax	2017-07-26 15:11:32 -07:00
Dan Finlay	8e2da52e64	Adjust mobile scale for smaller devices	2017-07-26 14:37:26 -07:00
Dan Finlay	8fc0a025f6	Set initial scale for mobile.	2017-07-26 14:36:22 -07:00
Kevin Serrano	520cda0058	Merge pull request #1834 from MetaMask/Version-3.9.2 ... Version 3.9.2	2017-07-26 14:28:09 -07:00
Dan Finlay	bc11f11d68	Merge pull request #1831 from sdtsui/pre-merge-fixes ... Add minor fixes, including account selection scroll	2017-07-26 14:27:14 -07:00
Dan Finlay	b50c10f373	Version 3.9.2	2017-07-26 14:15:24 -07:00
sdtsui	8006d798ee	Re-center network dropdown	2017-07-26 13:02:08 -07:00
sdtsui	4c0f827946	Make account selection dropdown menu scrollable when too large for view	2017-07-26 12:43:18 -07:00
sdtsui	0fdbb80962	Remove Account Settings item from optionsMenu, unnecessary	2017-07-26 12:31:08 -07:00
sdtsui	4573753233	Bump version of menu-droppo, no longer needs css transitions	2017-07-26 12:29:56 -07:00
Dan Finlay	3d8ebf2265	Begin implementing live-updating blacklist, not working yet	2017-07-26 12:27:16 -07:00
Frankie	f23efec3e3	Merge pull request #1830 from MetaMask/providerProxyFix ... NonceTracker - Provider proxy fix	2017-07-26 14:56:13 -04:00
kumavis	55a55141d0	nonce-tracker - fix test	2017-07-26 11:43:37 -07:00
kumavis	35a128db1e	nonce-tracker - hotfix for provider proxying	2017-07-26 11:37:00 -07:00
kumavis	b15a2baaf3	nonce-tracker - add raw baseNonceHex to nonceDetails	2017-07-26 11:09:02 -07:00
Dan Finlay	0deb617d8f	Merge pull request #1829 from MetaMask/betterErrorsOnTx ... cleanup logState log and tx history	2017-07-26 11:07:01 -07:00
kumavis	7e2e4948a6	tx cont - dont recursively store history	2017-07-26 10:57:47 -07:00
kumavis	9d69951dec	logState - dont redundantly log to console	2017-07-26 10:50:06 -07:00
Frankie	bbeecbbb28	Merge pull request #1828 from MetaMask/betterErrorsOnTx ... Nonce Tracker - better error messages, more debug info in tx history data	2017-07-26 13:48:08 -04:00
kumavis	de2cf4e9cd	Merge branch 'master' of github.com:MetaMask/metamask-plugin into betterErrorsOnTx	2017-07-26 10:43:36 -07:00
kumavis	0ef90fb1f0	tx controller + nonce tracker - record nonce components on txMeta	2017-07-26 10:40:08 -07:00
kumavis	39d28922de	nonce-tracker - validation - add validation failing value type to error message	2017-07-26 10:16:08 -07:00
kumavis	f16802e2d4	nonce-tracker - validation - add validation failing value to error message	2017-07-26 10:15:35 -07:00
Dan Finlay	0ea6749dbc	Lots of flex rearrangement on account detail view ... Includes removal of ReactCssTransitionGroup for a simpler UI refactor.	2017-07-25 18:25:56 -07:00
Thomas Huang	5af753a597	Merge pull request #1827 from MetaMask/test-coverage ... Coveralls badge directs to master branch	2017-07-25 18:08:22 -07:00
Thomas Huang	1eb089b0e7	Coveralls badge directs to master branch	2017-07-25 18:03:47 -07:00
kumavis	a8525d4b17	Merge pull request #1816 from MetaMask/test-coverage ... Test coverage	2017-07-25 17:46:23 -07:00
Dan Finlay	4d218ac57a	Remove responsive folder from gulp	2017-07-25 17:39:40 -07:00
Thomas Huang	3575bd49ab	Run coveralls on all branches	2017-07-25 16:59:08 -07:00
Thomas Huang	eb15663497	One script runs for Ci build	2017-07-25 16:33:52 -07:00
kumavis	4e9cfc935d	Merge pull request #1823 from MetaMask/betterErrorsOnTx ... Add stack traces both in errors and as a way to track txMetas	2017-07-25 15:39:54 -07:00
frankiebee	30cbe74ba6	Merge branch 'betterErrorsOnTx' of https://github.com/MetaMask/metamask-extension into betterErrorsOnTx	2017-07-25 18:33:52 -04:00
frankiebee	ba88f7b8dd	fix typo	2017-07-25 18:29:02 -04:00
Frankie	a929fb2387	Merge branch 'master' into betterErrorsOnTx	2017-07-25 18:26:41 -04:00
frankiebee	b81f883150	fix stack wording	2017-07-25 18:23:26 -04:00
frankiebee	1df833bee8	use clone	2017-07-25 18:21:40 -04:00
frankiebee	e0a626da3b	remove line numbers	2017-07-25 18:02:21 -04:00
Frankie	0c73d6d852	Merge pull request #1824 from MetaMask/tx-cont-fix ... TransactionController & NetworkController fixes	2017-07-25 17:46:31 -04:00
kumavis	5ec73c0e65	tx cont - fix test to use async api	2017-07-25 14:39:17 -07:00
kumavis	4445ba1569	tx cont - add argument for provider constructor	2017-07-25 14:36:19 -07:00
kumavis	5b9a6bd367	tx cont - remove old cb from async fn	2017-07-25 13:16:46 -07:00
frankiebee	ab01358a48	Add stack traces both in errors and as a way to track txMetas	2017-07-25 16:08:31 -04:00
Dan Finlay	e081ddf347	Merge pull request #1821 from MetaMask/fetch-retry-2 ... prov-eng - bump to ignore json parse errors	2017-07-25 12:43:48 -07:00
kumavis	77d91ec36f	prov-eng - bump to ignore json parse errors	2017-07-25 11:57:03 -07:00
Dan Finlay	7a04643d8e	Restore sort order fix	2017-07-24 21:43:34 -07:00
Dan Finlay	a22adec66f	Replace ui with responsive-ui	2017-07-24 17:05:07 -07:00
Dan Finlay	fcde52f390	Merge branch 'NewUI' of github.com:MetaMask/metamask-plugin into NewUI	2017-07-24 17:03:42 -07:00
Dan Finlay	de286d2382	Css tweaks	2017-07-24 17:03:30 -07:00
Thomas Huang	a1fab06490	Simplify the test-coverage script	2017-07-24 13:46:02 -07:00