aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Brought coverage up to 94% on test_commander.pyHenrique2019-11-161-4/+103
* Various changes to address PR commentsHenrique2019-11-165-25/+19
* Removing dead codeHenrique2019-11-161-8/+0
* Forgot to remove the empty `_parse_cmd` functionHenrique2019-11-161-5/+0
* Fixing issues pointed during PR reviewHenrique2019-11-164-50/+55
* Removed useless else that prevented 100% code coverageHenrique2019-11-151-2/+0
* Small fix for 100% coverageHenrique2019-11-151-7/+0
* Merge branch 'master' into fix-command-bar-issue-3259Henrique M. D2019-11-1551-269/+457
|\
| * 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
* | | | | | | Removed the custom lexer in favor of using pyparsing.Henrique2019-11-157-242/+193
* | | | | | | Added a new test to test that the issue from the previous commit won'tHenrique2019-11-131-1/+13
* | | | | | | Fixed issue introduced by change in the lexer that caused mitmproxy toHenrique2019-11-131-14/+21
* | | | | | | Added tests to reach 100% coverageHenrique2019-11-132-3/+5
* | | | | | | Removed an exception handle that can't happen anymore due to the newHenrique2019-11-131-11/+6
* | | | | | | Getting 100% coverage in the lexerHenrique2019-11-122-3/+14
* | | | | | | Fixing issues reported by the linterHenrique2019-11-124-62/+8
* | | | | | | Tests for the new lexerHenrique2019-11-121-0/+64
* | | | | | | Forgot to remove the import for shlexHenrique2019-11-121-1/+0
* | | | | | | Fixed test to use the new method to get the lexerHenrique2019-11-121-2/+2
* | | | | | | Small fix to handle line breaks and tabs \r\n\tHenrique2019-11-121-1/+4
* | | | | | | Created a lexer for the command barHenrique2019-11-122-50/+159