1117 Commits

Author	SHA1	Message	Date
Kevin Serrano	34e7bb5015	Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved	2017-09-07 13:20:14 -07:00
Kevin Serrano	69c7fe24b3	Place object property retrieval inside try-catch	2017-09-07 12:17:36 -07:00
Kevin Serrano	f0ab4ce52d	Change expected type to array.	2017-09-07 11:51:04 -07:00
Kevin Serrano	3e2bd19881	Merge branch 'master' into readd-loose	2017-09-05 15:48:15 -07:00
Dan Finlay	90272e252f	Make eth_sign deprecation warning more useful ... Link to descriptive article that demonstrates the new preferred method.	2017-09-05 11:44:26 -07:00
Kevin Serrano	e647337a8a	Resolve merge conflict from master	2017-09-05 09:03:44 -07:00
Dan Finlay	ddd559718f	Update support link	2017-09-01 11:01:53 -07:00
Kevin Serrano	4b058bc7eb	Merge branch 'master' into i1986-AddVersionToStateLogs	2017-08-29 18:09:39 -07:00
Thomas Huang	04011f9ea7	Multiple tokens shows the amount when greater than 1	2017-08-29 17:54:01 -07:00
Dan Finlay	54ce267a9f	Add version to state logs ... Fixes #1986	2017-08-29 11:42:44 -07:00
Dan Finlay	e0ccdcd6fd	Remove eth-tx-viz link from tx history icons	2017-08-23 09:40:24 -07:00
Dan Finlay	98bedfabf9	Fix eth sign formatting	2017-08-17 15:35:17 -07:00
Dan Finlay	343a7e9cce	Transition to home view after tx error	2017-08-16 17:06:21 -07:00
Dan Finlay	9fbdeab3de	Fallback to ethplorer link	2017-08-16 12:55:34 -07:00
Dan Finlay	3b6ee032f5	Remove dead code	2017-08-16 09:52:09 -07:00
Dan Finlay	722d91c866	Remove default tokens	2017-08-16 09:49:23 -07:00
Dan Finlay	b69f5533d9	ReEnable Token List	2017-08-16 09:49:18 -07:00
Kevin Serrano	923415213f	Merge pull request #1916 from MetaMask/fix/account-name-scroll ... Oneliner for account label overflow issue on QubesOS	2017-08-15 14:08:30 -07:00
Kevin Serrano	9c7abacf64	Change cursor type to indicate link.	2017-08-15 12:26:11 -07:00
frankiebee	a8d6e1fe98	fix spelling	2017-08-15 12:16:41 -07:00
frankiebee	176dd6d214	Disable token list	2017-08-15 12:12:57 -07:00
sdtsui	6168efc9cc	Fix overflow issue on QubesOS, flagged by @kumavis	2017-08-15 17:13:11 +02:00
davidp94	f52ef5d496	fix goHome	2017-08-14 21:51:39 -07:00
davidp94	39424cdf45	remove unused action type	2017-08-14 21:35:57 -07:00
DavidNinja	399c51c048	cancel all txs	2017-08-14 21:29:21 -07:00
sdtsui	9ec8663605	Cleanup stray logs and lint	2017-08-10 17:50:33 -07:00
sdtsui	2346c9b6b9	Add overflow support for all account names in account details	2017-08-10 17:49:12 -07:00
sdtsui	771f9ec124	Fix logic for dropdown components attaching checkmark to correct account	2017-08-10 17:37:55 -07:00
sdtsui	88f4931c6f	Fix text overflow for dropdown components flagged by @frankiebee	2017-08-10 17:37:36 -07:00
Kevin Serrano	45fc1d6ec3	Readd loose label onto accounts.	2017-08-09 17:40:01 -07:00
kumavis	245125eb18	ui - buy eth - formatting and moved network names to config	2017-08-09 12:25:38 -07:00
kumavis	052d338b2b	lint fix	2017-08-09 01:04:42 -07:00
kumavis	897d00efa0	ui - buy eth - add dharma beta to kovan	2017-08-09 01:00:06 -07:00
kumavis	84c3d3c6db	ui - buy button view - refactor	2017-08-09 00:36:18 -07:00
kumavis	922ecb9149	Merge branch 'master' into greenkeeper/initial	2017-08-08 16:23:14 -07:00
kumavis	7db1f30590	Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layout ... Improve layout for legacy buy screen	2017-08-08 15:56:02 -07:00
sdtsui	9d3b5348aa	Fix layout issues flagged by @tmashuang	2017-08-08 15:17:52 -07:00
sdtsui	b6a7281737	Make buy ui more central to the screen	2017-08-08 15:17:24 -07:00
Thomas Huang	67e4855b9d	Updated commonjs require path for redux-logger and redux-thunk modules	2017-08-08 14:15:45 -07:00
frankiebee	f3b42f1e33	Merge branch 'master' into transactionControllerRefractor	2017-08-07 16:24:58 -04:00
kumavis	78aa957e5a	Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial	2017-08-07 10:52:08 -07:00
sdtsui	b5251d22a6	Fix integration test failures: unnecessary sandwich-expando event stopPropagation	2017-08-04 23:34:26 -07:00
sdtsui	186bcec4fb	Lint menu-droppo	2017-08-04 13:31:18 -07:00
kumavis	5f8a2ea1e6	Merge pull request #1862 from sdtsui/add-rct ... Re-enable css transitions, only for dropdowns in app header	2017-08-04 13:22:25 -07:00
sdtsui	8cc3ae5988	Cleanup breakpoint css + comment on hackiness	2017-08-04 13:19:06 -07:00
sdtsui	0cd72db2d2	Adds early breakpoint from @frankiebee 's + @kumavis 's CR	2017-08-04 12:57:16 -07:00
sdtsui	4d967ebea9	Bring menu-droppo component into project, remove as a dependency	2017-08-04 11:47:36 -07:00
frankiebee	89a4fef1e4	Merge branch 'master' into transactionControllerRefractor	2017-08-04 14:45:22 -04:00
frankiebee	fa3df576bc	fixed: showing tx-s as errors vs. warning	2017-08-04 14:43:08 -04:00
sdtsui	781ac00eac	Re-enable css transitions for dropdowns in header, needs menu-droppo library update	2017-08-04 11:31:07 -07:00