aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* simplify install instructionsMaximilian Hils2019-11-202-71/+50
* Merge pull request #3717 from Jessonsotoventura/replayMaximilian Hils2019-11-201-8/+5
|\
| * added column for mark and replayJesson Soto Ventura2019-11-191-8/+5
* | Delete issue_template.mdMaximilian Hils2019-11-191-17/+0
* | update badgesMaximilian Hils2019-11-191-8/+4
* | Merge pull request #3714 from sethb157/ipv6_onlyMaximilian Hils2019-11-191-3/+15
|\ \
| * | Add support for IPv6-only environmentsSeth Barrios2019-11-181-3/+15
* | | Use Github Actions for CI (#3713)Maximilian Hils2019-11-1920-235/+388
* | | pin pyopenssl to fix builds, refs #3692Maximilian Hils2019-11-181-1/+1
* | | cleanup mypy usageMaximilian Hils2019-11-168-25/+17
* | | make mypy happyMaximilian Hils2019-11-161-2/+2
* | | Merge pull request #3702 from mckeimic/masterMaximilian Hils2019-11-162-10/+103
|\ \ \
| * | | fix lintMaximilian Hils2019-11-161-1/+1
| * | | minor type fixesMaximilian Hils2019-11-161-4/+6
| * | | Merge branch 'master' into masterMaximilian Hils2019-11-1617-173/+362
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3705 from mhils/issue-3469Maximilian Hils2019-11-163-35/+73
|\ \ \ \
| * | | | tests++Maximilian Hils2019-11-152-7/+28
| * | | | fix #3469Maximilian Hils2019-11-152-29/+46
* | | | | Merge pull request #3700 from Jessonsotoventura/confirm_quitMaximilian Hils2019-11-161-1/+1
|\ \ \ \ \
| * | | | | used getattr to select exitJesson Soto Ventura2019-11-151-5/+1
| * | | | | ctrl-c should prompt for an exitJesson Soto Ventura2019-11-141-1/+5
| | |_|/ / | |/| | |
* | | | | Merge pull request #3448 from cript0nauta/masterMaximilian Hils2019-11-162-42/+104
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | test coverage++Maximilian Hils2019-11-152-0/+9
| * | | | improve curl/httpie exportMaximilian Hils2019-11-152-40/+49
| * | | | Merge remote-tracking branch 'origin/master' into pr-3448Maximilian Hils2019-11-15117-674/+1478
| |\ \ \ \
| * | | | | Fix flake8 warning in curl_commandMatías Lang2019-01-141-4/+1
| * | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMatías Lang2019-01-1319-29/+32
| |\ \ \ \ \
| * | | | | | Refactor curl_command and httpie_commandMatías Lang2019-01-131-11/+10
| * | | | | | Fix command injection when exporting to httpieMatías Lang2019-01-132-13/+34
| * | | | | | Fix command injection when exporting to curlMatías Lang2019-01-132-14/+39
* | | | | | | 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
|/ / / / / / /