Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added column for mark and replay | Jesson Soto Ventura | 2019-11-19 | 1 | -8/+5 |
* | Merge pull request #3420 from rjt-gupta/multipart-fix | Maximilian Hils | 2019-11-15 | 7 | -20/+114 |
|\ | |||||
| * | test coverage improved | rjt-gupta | 2019-02-06 | 1 | -0/+19 |
| * | separate editors | rjt-gupta | 2019-02-06 | 3 | -11/+23 |
| * | multipart encoder and tests | rjt-gupta | 2019-02-06 | 4 | -15/+68 |
| * | multipart-fix | rjt-gupta | 2019-02-06 | 3 | -5/+15 |
* | | Merge pull request #3522 from peter-way/master | Maximilian Hils | 2019-11-15 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge branch 'master' into master | Maximilian Hils | 2019-11-15 | 108 | -602/+1380 |
| |\ \ | |||||
| * | | | Update serverplayback.py | Maximilian Hils | 2019-07-17 | 1 | -4/+1 |
| * | | | Use 'host_header' instead of 'host', when calculating 'HTTPRequest' hash in t... | peter-way | 2019-04-15 | 1 | -1/+4 |
* | | | | Merge pull request #3612 from ccssrryy/fix-dup-resp | Maximilian Hils | 2019-11-15 | 1 | -5/+8 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | fix duplicate error response | cs | 2019-08-09 | 1 | -5/+8 |
| |/ / | |||||
* | | | Merge pull request #3425 from rjt-gupta/external-viewer | Maximilian Hils | 2019-11-15 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | remove superfluous option | Maximilian Hils | 2019-11-15 | 1 | -5/+0 |
| * | | | option added | rjt-gupta | 2019-01-07 | 1 | -0/+5 |
| * | | | external-viewer-fix | rjt-gupta | 2018-12-17 | 1 | -2/+2 |
* | | | | Merge pull request #3703 from mhils/replay-ignore-port | Maximilian Hils | 2019-11-15 | 1 | -1/+10 |
|\ \ \ \ | |||||
| * | | | | allow server replay functionality to run on a different port | Jurriaan Bremer | 2019-11-15 | 1 | -1/+10 |
|/ / / / | |||||
* | | | | Merge pull request #3699 from mhils/flowfilter2019 | Maximilian Hils | 2019-11-15 | 2 | -65/+49 |
|\ \ \ \ | |||||
| * | | | | disable overly strict indentation checks | Maximilian Hils | 2019-11-15 | 1 | -1/+1 |
| * | | | | improve flowfilter | Maximilian Hils | 2019-11-15 | 1 | -64/+48 |
|/ / / / | |||||
* | | | | Merge pull request #3697 from ylmrx/issue_3639-yml_extension_allowed | Maximilian Hils | 2019-11-15 | 1 | -3/+2 |
|\ \ \ \ | |||||
| * | | | | simplify option file loading | Maximilian Hils | 2019-11-14 | 1 | -7/+5 |
| * | | | | adding config.yml as an allowed config filename | Yoann L | 2019-11-14 | 1 | -6/+7 |
* | | | | | Merge pull request #3698 from ylmrx/crash_on_empty_focus_next | Maximilian Hils | 2019-11-14 | 1 | -6/+12 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fixes #3694 | Yoann L | 2019-11-14 | 1 | -6/+12 |
|/ / / / | |||||
* | | | | Merge pull request #3691 from mhils/sans-io-adjustments | Maximilian Hils | 2019-11-12 | 40 | -167/+175 |
|\ \ \ \ | |||||
| * | | | | update mypy | Maximilian Hils | 2019-11-12 | 40 | -148/+154 |
| * | | | | minor improvements and sans-io adjustments | Maximilian Hils | 2019-11-11 | 6 | -33/+35 |
* | | | | | Merge pull request #3669 from jannst/add_howto_install_android_system_ca | Thomas Kriechbaumer | 2019-11-11 | 1 | -0/+86 |
|\ \ \ \ \ | |||||
| * | | | | | Adding tutorial on how to insert mitmproxy CA cert into the android system ce... | jannst | 2019-10-13 | 1 | -0/+86 |
* | | | | | | Merge pull request #3686 from mitmproxy/github-issue-templates | Thomas Kriechbaumer | 2019-11-07 | 2 | -0/+39 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update issue templates | Maximilian Hils | 2019-11-04 | 2 | -0/+39 |
* | | | | | | | Merge pull request #3679 from tomlabaude/pf_ipv6 | Maximilian Hils | 2019-11-07 | 3 | -2/+26 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | pfctl state output always have 2 lines for each socket. Adding outgoing lines... | Tom | 2019-11-05 | 2 | -0/+11 |
| * | | | | | | | Fixed lint | Tom | 2019-11-05 | 1 | -4/+4 |
| * | | | | | | | Added support for IPv6 in pf.py for macOS | Tom | 2019-11-05 | 1 | -2/+15 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #3688 from mitmproxy/sans-io-adjustments | Maximilian Hils | 2019-11-07 | 2 | -1/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | make duration formatting more forgiving | Maximilian Hils | 2019-11-07 | 2 | -1/+4 |
|/ / / / / / | |||||
* | | | | | | squash remaining forum reference | Maximilian Hils | 2019-11-04 | 1 | -4/+3 |
* | | | | | | update badges | Maximilian Hils | 2019-11-04 | 1 | -11/+9 |
* | | | | | | Update issue_template.md | Maximilian Hils | 2019-11-04 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #3675 from ylmrx/crash_on_replay-3559 | Maximilian Hils | 2019-11-04 | 1 | -2/+3 |
|\ \ \ \ \ | |||||
| * | | | | | take no action if on `Host` if `:authority` isn't found | Yoann L | 2019-11-04 | 1 | -2/+3 |
| * | | | | | fixes #3559 | Yoann L | 2019-10-25 | 1 | -1/+1 |
* | | | | | | Merge pull request #3676 from ylmrx/fix_curl_export | Maximilian Hils | 2019-10-30 | 2 | -26/+22 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | simplify condition | Maximilian Hils | 2019-10-29 | 1 | -3/+1 |
| * | | | | | missed a type ignore, for mypy compliance | Yoann L | 2019-10-29 | 1 | -1/+1 |
| * | | | | | several fixes on command exports has several problems: #3676 | Yoann L | 2019-10-29 | 1 | -22/+11 |
| * | | | | | several fixes on command exports has several problems: #3676 | Yoann L | 2019-10-28 | 2 | -15/+24 |
|/ / / / / |