6104 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Maximilian Hils	74c991d70b	Merge pull request #2002 from mitmproxy/content_views_edit ... Content views edit	2017-02-09 23:21:44 +01:00
Ujjwal Verma	d6465b907f	Closes #1580 Gives warning when explicit proxy configured in transparent mode (#1996)	2017-02-09 20:56:06 +01:00
Maximilian Hils	380ff50e57	Merge pull request #2003 from Kriechi/coverage++ ... test refactoring and coverage++	2017-02-09 17:45:50 +01:00
Maximilian Hils	da8444b11f	flow_count() -> len(flows)	2017-02-09 16:44:27 +01:00
Maximilian Hils	1084588103	Merge pull request #1998 from mhils/fix-change-upstream ... Fix change_upstream_proxy_server	2017-02-09 16:39:20 +01:00
Thomas Kriechbaumer	d10560d54c	improve coverage report	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	2ff5d72236	minor changes	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	0299bb5b2e	eventsequence: coverage++	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	5a3976c43e	coverage whitelist -> blacklist	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	f6cea09d5a	stateobject: coverage++	2017-02-09 16:08:36 +01:00
Thomas Kriechbaumer	1847cf175c	websockets, tcp, version: coverage++	2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer	2134b5b06a	remove FIXME	2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer	b5f0342664	remove verified remark	2017-02-09 16:08:35 +01:00
Thomas Kriechbaumer	ae94ca6fa9	remove deprecated flow_count function	2017-02-09 16:08:35 +01:00
Maximilian Hils	d6d1ff0170	simplify state copy	2017-02-09 16:08:24 +01:00
Maximilian Hils	9b97b63891	fix change_upstream_proxy_server	2017-02-09 15:24:31 +01:00
Maximilian Hils	7a205e80aa	improve stateobject tests	2017-02-09 14:21:25 +01:00
Maximilian Hils	fa661217c1	Merge pull request #2001 from mitmproxy/issue#40_response_body_edit ... fix response body edit issue	2017-02-09 13:29:41 +01:00
Maximilian Hils	4cf6047a4e	Merge pull request #1999 from Kriechi/coverage++ ... pytest.raises: shim new API	2017-02-09 10:42:55 +01:00
cle1000	fb06c66437	remove contentview selector and view description if edit mode is on	2017-02-08 21:09:03 +01:00
cle1000	b4bed57d4c	fix show_lines button visible in edit mode if you change tabs	2017-02-08 21:07:40 +01:00
Thomas Kriechbaumer	7a9d40817c	pytest.raises: shim new API	2017-02-08 20:04:07 +01:00
cle1000	dae0c23ec8	fix response body edit issue	2017-02-08 19:57:57 +01:00
Maximilian Hils	28c0596742	Merge pull request #1997 from s4chin/add-gif-parser ... Add gif parser and tests	2017-02-08 12:09:48 +01:00
Maximilian Hils	79354c0b43	Merge pull request #1984 from ujjwal96/har_dump-fix ... Fixes #1978	2017-02-08 12:01:32 +01:00
Sachin Kelkar	66ad95c330	Fix gif parsing error on some gifs and add test	2017-02-08 00:03:07 +05:30
Sachin Kelkar	4ef5de2cce	Add gif parser and tests	2017-02-06 17:57:59 +05:30
Ujjwal Verma	c622622c59	Encoding fixes and tests	2017-02-05 18:59:01 +05:30
Thomas Kriechbaumer	2316c0fb74	Merge pull request #1993 from Kriechi/coverage++ ... fix flaky test	2017-02-05 11:29:27 +01:00
Thomas Kriechbaumer	288f9a3857	fix flaky test	2017-02-05 10:42:47 +01:00
Maximilian Hils	d133b8baee	Merge pull request #1989 from Kriechi/coverage++ ... coverage++	2017-02-04 16:05:11 +01:00
Thomas Kriechbaumer	966ffaa3d6	coverage++	2017-02-04 13:48:55 +01:00
Maximilian Hils	155670766e	Merge pull request #1988 from krsoninikhil/ordereddict ... Closes #1977	2017-02-04 13:46:44 +01:00
Nikhil Soni	e6de57ccc6	Changes view._store from dict to OrderedDict	2017-02-04 17:44:22 +05:30
Maximilian Hils	53f298ac41	Merge pull request #1967 from s4chin/remove-pillow ... Add png parser	2017-02-03 18:58:34 +01:00
Maximilian Hils	bbdb7300fd	Merge pull request #1983 from Kriechi/coverage++ ... coverage++	2017-02-03 18:56:56 +01:00
Sachin Kelkar	15548ff433	Feedback	2017-02-03 18:40:50 +05:30
Maximilian Hils	85e39b86bb	update installbuilder	2017-02-03 12:04:11 +01:00
Thomas Kriechbaumer	bcaaa2f40b	coverage++	2017-02-03 11:55:33 +01:00
Maximilian Hils	3f26a0b5a5	Merge pull request #1982 from ujjwal96/preserve-marked-flows ... Closes #1960 'Z' removes unmarked flows	2017-02-03 11:43:57 +01:00
Sachin Kelkar	0674485e76	Fix and cleanup	2017-02-03 15:02:35 +05:30
Sachin Kelkar	88dbfd5257	Add iTXt and zTXt tests	2017-02-03 14:12:54 +05:30
Sachin Kelkar	abef020e07	Fix as per feedback and add more tests	2017-02-03 14:12:54 +05:30
Sachin Kelkar	6202958048	Add png parser	2017-02-03 14:12:54 +05:30
Ujjwal Verma	e10c36fe11	Added test	2017-02-03 02:58:02 +05:30
Ujjwal Verma	11b4b3209d	Closes #1960 'Z' removes unmarked flows	2017-02-03 01:35:53 +05:30
Thomas Kriechbaumer	79aa994275	fix merge	2017-02-02 17:26:31 +01:00
Maximilian Hils	8b6e3d8bd3	Merge pull request #1979 from 0neblock/master ... Fixed following on flowlist	2017-02-02 17:24:04 +01:00
Thomas Kriechbaumer	3f4d472c80	Merge pull request #1980 from Kriechi/improve-tests ... improve tests	2017-02-02 17:23:11 +01:00
Thomas Kriechbaumer	4f0b2bc4de	adapt coverage checks	2017-02-02 14:20:56 +01:00