aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added column for mark and replayJesson Soto Ventura2019-11-191-8/+5
* Merge pull request #3420 from rjt-gupta/multipart-fixMaximilian Hils2019-11-157-20/+114
|\
| * test coverage improvedrjt-gupta2019-02-061-0/+19
| * separate editorsrjt-gupta2019-02-063-11/+23
| * multipart encoder and testsrjt-gupta2019-02-064-15/+68
| * multipart-fixrjt-gupta2019-02-063-5/+15
* | Merge pull request #3522 from peter-way/masterMaximilian Hils2019-11-151-1/+1
|\ \
| * \ Merge branch 'master' into masterMaximilian Hils2019-11-15108-602/+1380
| |\ \
| * | | Update serverplayback.pyMaximilian Hils2019-07-171-4/+1
| * | | Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in t...peter-way2019-04-151-1/+4
* | | | Merge pull request #3612 from ccssrryy/fix-dup-respMaximilian Hils2019-11-151-5/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | fix duplicate error responsecs2019-08-091-5/+8
| |/ /
* | | Merge pull request #3425 from rjt-gupta/external-viewerMaximilian Hils2019-11-151-2/+2
|\ \ \
| * | | remove superfluous optionMaximilian Hils2019-11-151-5/+0
| * | | option addedrjt-gupta2019-01-071-0/+5
| * | | external-viewer-fixrjt-gupta2018-12-171-2/+2
* | | | Merge pull request #3703 from mhils/replay-ignore-portMaximilian Hils2019-11-151-1/+10
|\ \ \ \
| * | | | allow server replay functionality to run on a different portJurriaan Bremer2019-11-151-1/+10
|/ / / /
* | | | Merge pull request #3699 from mhils/flowfilter2019Maximilian Hils2019-11-152-65/+49
|\ \ \ \
| * | | | disable overly strict indentation checksMaximilian Hils2019-11-151-1/+1
| * | | | improve flowfilterMaximilian Hils2019-11-151-64/+48
|/ / / /
* | | | Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowedMaximilian Hils2019-11-151-3/+2
|\ \ \ \
| * | | | simplify option file loadingMaximilian Hils2019-11-141-7/+5
| * | | | adding config.yml as an allowed config filenameYoann L2019-11-141-6/+7
* | | | | Merge pull request #3698 from ylmrx/crash_on_empty_focus_nextMaximilian Hils2019-11-141-6/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fixes #3694Yoann L2019-11-141-6/+12
|/ / / /
* | | | Merge pull request #3691 from mhils/sans-io-adjustmentsMaximilian Hils2019-11-1240-167/+175
|\ \ \ \
| * | | | update mypyMaximilian Hils2019-11-1240-148/+154
| * | | | minor improvements and sans-io adjustmentsMaximilian Hils2019-11-116-33/+35
* | | | | Merge pull request #3669 from jannst/add_howto_install_android_system_caThomas Kriechbaumer2019-11-111-0/+86
|\ \ \ \ \
| * | | | | Adding tutorial on how to insert mitmproxy CA cert into the android system ce...jannst2019-10-131-0/+86
* | | | | | Merge pull request #3686 from mitmproxy/github-issue-templatesThomas Kriechbaumer2019-11-072-0/+39
|\ \ \ \ \ \
| * | | | | | Update issue templatesMaximilian Hils2019-11-042-0/+39
* | | | | | | Merge pull request #3679 from tomlabaude/pf_ipv6Maximilian Hils2019-11-073-2/+26
|\ \ \ \ \ \ \
| * | | | | | | pfctl state output always have 2 lines for each socket. Adding outgoing lines...Tom2019-11-052-0/+11
| * | | | | | | Fixed lintTom2019-11-051-4/+4
| * | | | | | | Added support for IPv6 in pf.py for macOSTom2019-11-051-2/+15
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3688 from mitmproxy/sans-io-adjustmentsMaximilian Hils2019-11-072-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | make duration formatting more forgivingMaximilian Hils2019-11-072-1/+4
|/ / / / / /
* | | | | | squash remaining forum referenceMaximilian Hils2019-11-041-4/+3
* | | | | | update badgesMaximilian Hils2019-11-041-11/+9
* | | | | | Update issue_template.mdMaximilian Hils2019-11-041-1/+1
|/ / / / /
* | | | | Merge pull request #3675 from ylmrx/crash_on_replay-3559Maximilian Hils2019-11-041-2/+3
|\ \ \ \ \
| * | | | | take no action if on `Host` if `:authority` isn't foundYoann L2019-11-041-2/+3
| * | | | | fixes #3559Yoann L2019-10-251-1/+1
* | | | | | Merge pull request #3676 from ylmrx/fix_curl_exportMaximilian Hils2019-10-302-26/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | simplify conditionMaximilian Hils2019-10-291-3/+1
| * | | | | missed a type ignore, for mypy complianceYoann L2019-10-291-1/+1
| * | | | | several fixes on command exports has several problems: #3676Yoann L2019-10-291-22/+11
| * | | | | several fixes on command exports has several problems: #3676Yoann L2019-10-282-15/+24
|/ / / / /