cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #2024 from MatthewShao/fix_websocket_msg_in_console	Maximilian Hils	2017-02-14	1	-1/+1
\|\
\| *	fix websocket message display crash in console.	Matthew Shao	2017-02-14	1	-1/+1
* \|	fix typo	Maximilian Hils	2017-02-14	1	-1/+1
\|/
*	Merge pull request #2016 from Kriechi/pathod-refactor	Maximilian Hils	2017-02-13	1	-11/+30
\|\
\| *	remove treq from pathoc	Thomas Kriechbaumer	2017-02-12	1	-11/+30
* \|	Merge pull request #2015 from Kriechi/nuke-pypy	Maximilian Hils	2017-02-13	2	-3/+1
\|\ \ \| \|/ \|/\|
\| *	nuke pypy	Thomas Kriechbaumer	2017-02-12	2	-3/+1
\|/
*	add version info to web footer (#2010)	Alireza Mosajjal	2017-02-12	1	-1/+4
*	Merge pull request #2000 from s4chin/add-jpeg-parser	Maximilian Hils	2017-02-11	18	-40/+1511
\|\
\| *	Add sources of images, remove copyrighted image	Sachin Kelkar	2017-02-12	8	-11/+42
\| *	Fix coverage	Sachin Kelkar	2017-02-11	1	-9/+0
\| *	Add app1 marker and tests	Sachin Kelkar	2017-02-10	8	-558/+1196
\| *	Add jpeg app0 sof0 com parsing	Sachin Kelkar	2017-02-10	7	-0/+811
\| *	Update kaitaistruct version to 0.6	Sachin Kelkar	2017-02-08	3	-30/+30
* \|	Merge pull request #2008 from yjh0502/master	Maximilian Hils	2017-02-11	5	-1/+61
\|\ \
\| * \|	Add transparent proxy support for OpenBSD	Jihyun Yu	2017-02-11	5	-1/+61
* \| \|	consolidate readme shields	Maximilian Hils	2017-02-11	1	-4/+4
\|/ /
* \|	Merge pull request #2005 from ujjwal96/script-reload	Maximilian Hils	2017-02-11	2	-2/+12
\|\ \
\| * \|	closes #1828 script reloads on py file changes	Ujjwal Verma	2017-02-10	2	-2/+12
* \| \|	Merge pull request #2007 from mitmproxy/update-dependencies	Maximilian Hils	2017-02-11	1	-1/+1
\|\ \ \
\| * \| \|	update mypy	Maximilian Hils	2017-02-11	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #2006 from Kriechi/coverage++	Maximilian Hils	2017-02-11	10	-75/+95
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	coverage++	Thomas Kriechbaumer	2017-02-10	10	-75/+95
* \| \|	Update .travis.yml	Thomas Kriechbaumer	2017-02-10	1	-3/+2
\|/ /
* \|	Merge pull request #2004 from mhils/update-dependencies	Maximilian Hils	2017-02-10	1	-3/+3
\|\ \
\| * \|	update dependencies	Maximilian Hils	2017-02-10	1	-3/+3
* \| \|	fix flaky coverage	Maximilian Hils	2017-02-10	1	-2/+2
\|/ /
* \|	Merge pull request #2002 from mitmproxy/content_views_edit	Maximilian Hils	2017-02-09	3	-15/+6
\|\ \
\| * \|	remove contentview selector and view description if edit mode is on	cle1000	2017-02-08	2	-14/+5
\| * \|	fix show_lines button visible in edit mode if you change tabs	cle1000	2017-02-08	1	-1/+1
\| \|/
* \|	Closes #1580 Gives warning when explicit proxy configured in transparent mode...	Ujjwal Verma	2017-02-09	2	-4/+21
* \|	Merge pull request #2003 from Kriechi/coverage++	Maximilian Hils	2017-02-09	25	-224/+295
\|\ \
\| * \|	improve coverage report	Thomas Kriechbaumer	2017-02-09	1	-6/+12
\| * \|	minor changes	Thomas Kriechbaumer	2017-02-09	4	-3/+13
\| * \|	eventsequence: coverage++	Thomas Kriechbaumer	2017-02-09	8	-96/+72
\| * \|	coverage whitelist -> blacklist	Thomas Kriechbaumer	2017-02-09	2	-24/+11
\| * \|	stateobject: coverage++	Thomas Kriechbaumer	2017-02-09	1	-0/+12
\| * \|	websockets, tcp, version: coverage++	Thomas Kriechbaumer	2017-02-09	10	-66/+171
\| * \|	remove FIXME	Thomas Kriechbaumer	2017-02-09	1	-4/+3
\| * \|	remove verified remark	Thomas Kriechbaumer	2017-02-09	1	-1/+0
\| * \|	remove deprecated flow_count function	Thomas Kriechbaumer	2017-02-09	3	-15/+11
\| * \|	simplify state copy	Maximilian Hils	2017-02-09	2	-21/+2
* \| \|	flow_count() -> len(flows)	Maximilian Hils	2017-02-09	1	-2/+2
* \| \|	Merge pull request #1998 from mhils/fix-change-upstream	Maximilian Hils	2017-02-09	2	-2/+33
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	fix change_upstream_proxy_server	Maximilian Hils	2017-02-09	2	-2/+33
* \| \|	improve stateobject tests	Maximilian Hils	2017-02-09	1	-1/+7
* \| \|	Merge pull request #2001 from mitmproxy/issue#40_response_body_edit	Maximilian Hils	2017-02-09	1	-1/+0
\|\ \ \
\| * \| \|	fix response body edit issue	cle1000	2017-02-08	1	-1/+0
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #1999 from Kriechi/coverage++	Maximilian Hils	2017-02-09	22	-106/+83
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	pytest.raises: shim new API	Thomas Kriechbaumer	2017-02-08	22	-106/+83
\|/ /