cloud-email/mitmproxy - clone of mitm proxy

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| *	fix compat with Python 3.5.0	Maximilian Hils	2016-12-28	2	-8/+22
\|/
*	update io compat for 2.0	Maximilian Hils	2016-12-27	1	-0/+6
\|
*	Update README.md	Maximilian Hils	2016-12-27	1	-1/+1
\|
*	Update README.md	Maximilian Hils	2016-12-27	1	-0/+1
\|
*	bump version for next release cycle	Maximilian Hils	2016-12-27	1	-1/+1
\|
*	Merge pull request #1887 from Kriechi/h2-enable	Thomas Kriechbaumer	2016-12-27	2	-5/+4
\|\ \| \| \| \|	enable HTTP/2 by default
\| *	enable HTTP/2 by default	Thomas Kriechbaumer	2016-12-26	2	-5/+4
\| \|
* \|	add mitmweb to README	Maximilian Hils	2016-12-27	1	-0/+2
\| \|
* \|	bump version to 1.0.1	Maximilian Hils	2016-12-27	1	-1/+1
\| \|
* \|	turns out we need this	Maximilian Hils	2016-12-27	1	-0/+1
\| \|
* \|	fix url.parse tests for Python 3.6	Maximilian Hils	2016-12-27	1	-3/+10
\| \| \| \| \| \| \| \|	This is a simpler version of @Kriechi's patch.
* \|	py36: fix type information	Thomas Kriechbaumer	2016-12-27	1	-7/+20
\| \|
* \|	run tests on Python 3.6	Thomas Kriechbaumer	2016-12-27	5	-3/+15
\| \|
* \|	pyinstaller: use fixed bootloaders on linux	Maximilian Hils	2016-12-27	1	-1/+3
\|/
*	update windows dev script	Maximilian Hils	2016-12-26	1	-1/+6
\|
*	add mitmweb explanation to introduction	Maximilian Hils	2016-12-26	1	-0/+2
\|
*	Bump changelog timestamp	Aldo Cortesi	2016-12-26	1	-1/+1
\|
*	Merge pull request #1865 from cortesi/admin	Aldo Cortesi	2016-12-24	5	-131/+102
\|\ \| \| \| \|	Release administrivia: changelog stub, contributors, bump to v1.0
\| *	Merge branch 'master' into admin	Aldo Cortesi	2016-12-24	30	-110/+310
\| \|\ \| \|/ \|/\|
* \|	remove output of dumper during tests	Thomas Kriechbaumer	2016-12-21	4	-8/+11
\| \|
* \|	remove output of webmaster during tests	Thomas Kriechbaumer	2016-12-21	1	-0/+1
\| \|
* \|	reflow docs	Thomas Kriechbaumer	2016-12-21	2	-25/+45
\| \|
* \|	Merge pull request #1882 from mhils/docs	Thomas Kriechbaumer	2016-12-21	4	-60/+86
\|\ \ \| \| \| \| \| \|	Docs: Add mitmweb, restructure installation
\| * \|	update installation page	Maximilian Hils	2016-12-20	1	-60/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We emphasize the binary installation because that is usually the simplest method to install mitmproxy on all major platforms.
\| * \|	docs: add mitmweb stub	Maximilian Hils	2016-12-20	3	-0/+17
\| \| \|
* \| \|	Merge pull request #1881 from mhils/fix-alpn-bytes	Thomas Kriechbaumer	2016-12-20	4	-6/+26
\|\ \ \ \| \| \| \| \| \| \| \|	Always Decode ALPN Where Required
\| * \| \|	always decode alpn where required	Maximilian Hils	2016-12-20	4	-6/+26
\| \|/ /
* \| \|	Merge pull request #1880 from mhils/1877	Maximilian Hils	2016-12-19	2	-1/+14
\|\ \ \ \| \|/ / \|/\| \|	Fix #1877
\| * \|	fix #1877	Maximilian Hils	2016-12-19	2	-1/+14
\| \| \|
* \| \|	Merge branch 'rename-log-example'	Maximilian Hils	2016-12-19	2	-2/+2
\|\ \ \
\| * \| \|	rename logging.py example. this conflicted with Python's stdlib	Maximilian Hils	2016-12-19	2	-2/+2
\| \|/ /
* / /	fix io compat with previous releases	Maximilian Hils	2016-12-19	3	-4/+99
\|/ /
* \|	Merge pull request #1876 from mhils/1858	Maximilian Hils	2016-12-19	5	-20/+29
\|\ \ \| \| \| \| \| \|	fix #1858
\| * \|	fix #1858	Maximilian Hils	2016-12-19	5	-20/+29
\| \| \|
* \| \|	Merge pull request #1875 from Kriechi/dont-log-tracebacks	Thomas Kriechbaumer	2016-12-17	3	-9/+3
\|\ \ \ \| \| \| \| \| \| \| \|	don't log full tracebacks
\| * \| \|	don't log full tracebacks	Thomas Kriechbaumer	2016-12-17	3	-9/+3
\| \| \| \|
* \| \| \|	fix #1867 (#1873)	Maximilian Hils	2016-12-17	1	-2/+1
\| \| \| \|
* \| \| \|	Merge pull request #1874 from Kriechi/bump-h2	Thomas Kriechbaumer	2016-12-17	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|	bump h2
\| * \| \|	bump h2	Thomas Kriechbaumer	2016-12-17	1	-1/+1
\|/ / / \| \| \| \| \| \| \| \| \|	This takes care of https://github.com/python-hyper/hyper-h2/issues/422
* \| \|	Merge pull request #1871 from Kriechi/http2-gui	Maximilian Hils	2016-12-17	4	-3/+23
\|\ \ \ \| \| \| \| \| \| \| \|	display ALPN information
\| * \| \|	display ALPN information	Thomas Kriechbaumer	2016-12-17	4	-3/+23
\| \| \| \|
* \| \| \|	Merge pull request #1872 from mhils/appveyor	Thomas Kriechbaumer	2016-12-17	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /	appveyor: don't build installer for PRs
\| * \|	appveyor: don't build installer for PRs	Maximilian Hils	2016-12-17	1	-1/+1
\| \| \|
* \| \|	Merge pull request #1870 from Kriechi/http2-timeouts	Thomas Kriechbaumer	2016-12-17	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|	http2: faster timeouts
\| * \|	http2: faster timeouts	Thomas Kriechbaumer	2016-12-17	1	-2/+2
\| \| \|
\| \| *	add mitmweb and Windows compat to changelog	Maximilian Hils	2016-12-22	1	-0/+8
\| \| \|
\| \| *	Update CHANGELOG	Thomas Kriechbaumer	2016-12-21	1	-6/+7
\| \| \| \| \| \| \| \| \|	update changelog
\| \| *	Update CHANGELOG	Maximilian Hils	2016-12-21	1	-1/+1
\| \| \|
\| \| *	Compat 0.19 -> 1.0	Aldo Cortesi	2016-12-17	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	0.19 was never released, but let's include a conversion for it anyway, since it was the master version.
\| \| *	Administrivia: docs for new config file, minor adjustments	Aldo Cortesi	2016-12-17	3	-81/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For now, the config file docs basically say "it's YAML, read the source". We should do better for the next release.