aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* convert old flows to 0.17Maximilian Hils2016-02-141-0/+6
* bump versionMaximilian Hils2016-02-142-8/+24
* update dependenciesMaximilian Hils2016-02-141-1/+1
* fix plain http proxyingMaximilian Hils2016-02-141-0/+1
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-1414-39/+19
|\
| * Merge pull request #935 from mitmproxy/coding-styleMaximilian Hils2016-02-1413-36/+6
| |\
| | * remove noop codeThomas Kriechbaumer2016-02-143-19/+0
| | * autoflakeThomas Kriechbaumer2016-02-149-18/+7
| | * autopep8Thomas Kriechbaumer2016-02-145-3/+3
| |/
| * improve landscape configThomas Kriechbaumer2016-02-141-3/+7
| * Merge pull request #933 from mitmproxy/http2-logThomas Kriechbaumer2016-02-141-0/+6
| |\
| | * print http2 frames to debug logMaximilian Hils2016-02-141-0/+6
| |/
* / mitmweb: fix _strip_contentMaximilian Hils2016-02-141-0/+2
|/
* make travis less noisyMaximilian Hils2016-02-141-1/+1
* Merge pull request #932 from fimad/masterMaximilian Hils2016-02-141-4/+3
|\
| * Do not send Proxy-Agent in CONNECT responsesWill Coster2016-02-131-4/+3
|/
* Merge pull request #929 from ganguera/ganguera/basic_authMaximilian Hils2016-02-124-4/+67
|\
| * Send password_manager as a general application setting instead of per handlerGuillem Anguera2016-02-121-12/+4
| * Added Basic Auth support for MITMWeb interfaceGuillem Anguera2016-02-114-4/+75
* | improve snapshot uploadMaximilian Hils2016-02-123-25/+18
* | Merge pull request #931 from mortonfox/patch-1Maximilian Hils2016-02-121-2/+2
|\ \
| * | Update virtualenv linksMorton Fox2016-02-121-2/+2
|/ /
* / workaround for RTD issue rtfd/readthedocs.org#152Maximilian Hils2016-02-111-1/+1
|/
* fix #823Maximilian Hils2016-02-103-3/+13
* relax dependencies for enum34, fix #924Maximilian Hils2016-02-101-1/+1
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-103-50/+229
|\
| * Merge pull request #916 from dufferzafar/export-codeMaximilian Hils2016-02-103-50/+229
| |\
| | * Use textwrap.dedent in flow_export.python_code tooShadab Zafar2016-02-101-10/+13
| | * Use classes to test a command, move code to separate methods underShadab Zafar2016-02-091-114/+126
| | * Use textwrap.dedent to improve readability of testsShadab Zafar2016-02-091-51/+82
| | * Rename test_export_flow.py to test_flow_export.pyShadab Zafar2016-02-091-0/+0
| | * Fix content length header issuesShadab Zafar2016-02-081-2/+6
| | * Tests for flow_export.raw_requestShadab Zafar2016-02-081-1/+23
| | * Tests for flow_export.python_codeShadab Zafar2016-02-081-0/+46
| | * Test exact return value of flow_export.curl_commandShadab Zafar2016-02-081-4/+15
| | * Add some basic tests for flow_exportsShadab Zafar2016-02-081-0/+22
| | * Move exporters to a separate fileShadab Zafar2016-02-082-76/+78
| | * Export any flow as Python code, not just GETShadab Zafar2016-02-061-5/+19
| | * Refactor copy_as_python_codeShadab Zafar2016-02-061-13/+25
* | | fix #925Maximilian Hils2016-02-101-6/+10
|/ /
* | fix syntaxThomas Kriechbaumer2016-02-081-1/+2
* | fix #920Thomas Kriechbaumer2016-02-081-0/+19
* | Merge pull request #921 from mitmproxy/model-cleanupThomas Kriechbaumer2016-02-0810-182/+146
|\ \
| * | make stateobject simpler and stricterMaximilian Hils2016-02-088-111/+87
| * | simplify state managementMaximilian Hils2016-02-088-90/+78
|/ /
* | remove duplicate codeMaximilian Hils2016-02-081-27/+0
* | fix #876Maximilian Hils2016-02-082-4/+11
* | http2: indicate http version in the uiMaximilian Hils2016-02-082-3/+12
* | http2: fix http_versionMaximilian Hils2016-02-081-2/+2
* | raise error if --http2 is specified, but the OpenSSL version doesn't support itMaximilian Hils2016-02-082-0/+8