Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3603 from tomsaleeba/patch-1 | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+25 |
|\ | |||||
| * | docs: correct command to install mitmproxy | Tom Saleeba | 2019-08-01 | 1 | -1/+3 |
| * | docs: add instructions for transparent proxy on Linux for traffic originating... | Tom Saleeba | 2019-08-01 | 1 | -0/+23 |
* | | Merge pull request #3600 from king6cong/master | Thomas Kriechbaumer | 2019-09-28 | 1 | -11/+5 |
|\ \ | |||||
| * | | fix pf.conf on macOS | king6cong | 2019-07-30 | 1 | -11/+5 |
| |/ | |||||
* | | Merge pull request #3646 from ahopkins/patch-1 | Thomas Kriechbaumer | 2019-09-28 | 1 | -0/+3 |
|\ \ | |||||
| * | | Update concepts-certificates.md | Adam Hopkins | 2019-09-24 | 1 | -0/+3 |
* | | | Merge pull request #3648 from Eluch/master | Thomas Kriechbaumer | 2019-09-28 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | ssl_insecure added to option_whitelist because it was missing | Ferenc soós | 2019-09-27 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3593 from Jessonsotoventura/tabular | Maximilian Hils | 2019-09-26 | 9 | -25/+496 |
|\ \ \ | |/ / |/| | | |||||
| * | | Updated Setup.py | Jesson Soto Ventura | 2019-09-24 | 1 | -1/+1 |
| * | | Merge branch 'master' into tabular | Jesson Soto Ventura | 2019-09-24 | 12 | -24/+48 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #3631 from mhils/lint | Maximilian Hils | 2019-09-05 | 6 | -18/+17 |
|\ \ \ | |||||
| * | | | lint | Maximilian Hils | 2019-09-05 | 6 | -18/+17 |
* | | | | Merge pull request #3627 from RamiBerm/patch-1 | Maximilian Hils | 2019-09-05 | 1 | -1/+4 |
|\ \ \ \ | |||||
| * | | | | make dict comprehension more readable | Maximilian Hils | 2019-09-05 | 1 | -1/+4 |
| * | | | | Updated har_dump,py timings dictionary function | RamiBerm | 2019-09-03 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #3630 from tsaaristo/encode-zstandard | Maximilian Hils | 2019-09-05 | 6 | -5/+27 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | encoding: add support for zstd (zstandard) | Tero Saaristo | 2019-09-05 | 6 | -5/+27 |
| |/ / | |||||
* / / | lint | Maximilian Hils | 2019-09-05 | 1 | -0/+1 |
|/ / | |||||
| * | Fixed Duration on list view | Jesson Soto Ventura | 2019-09-24 | 1 | -2/+3 |
| * | TLD and SLD are now highlighted using publicsuffix | Jesson Soto Ventura | 2019-09-24 | 3 | -17/+26 |
| * | Fixed linting issues | Jesson Soto Ventura | 2019-07-21 | 7 | -17/+17 |
| * | Added console_flowlist_layout option | Jesson Soto Ventura | 2019-07-21 | 5 | -13/+125 |
| * | Merge branch 'tabular' of github.com:Jessonsotoventura/mitmproxy into tabular | Jesson Soto Ventura | 2019-07-21 | 1 | -1/+8 |
| |\ | |||||
| | * | Added Color palettes for lowlight, lowdark, solarized light, and solarized dark | Jesson Soto Ventura | 2019-07-21 | 2 | -6/+67 |
| * | | Merge branch 'tabular' of https://github.com/BkPHcgQL3V/mitmproxy into tabular | Jesson Soto Ventura | 2019-07-21 | 1 | -1/+2 |
| |\| | |||||
| | * | Tabular list flow | BkPHcgQL3V | 2018-12-19 | 4 | -75/+356 |
| * | | Added Color palettes for lowlight, lowdark, solarized light, and solarized dark | Jesson Soto Ventura | 2019-07-21 | 2 | -6/+67 |
| * | | Tabular list flow | BkPHcgQL3V | 2019-07-21 | 4 | -75/+356 |
|/ / | |||||
* | | Merge pull request #3591 from mhils/misc | Maximilian Hils | 2019-07-19 | 1 | -1/+1 |
|\ \ | |||||
| * | | fix addon deconstruction | Maximilian Hils | 2019-07-18 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3587 from mhils/yaml-list | Maximilian Hils | 2019-07-18 | 1 | -1/+3 |
|\ \ | |||||
| * | | fix sequence option declaration in yaml files | Maximilian Hils | 2019-07-18 | 1 | -1/+3 |
* | | | remove unused dependency | Maximilian Hils | 2019-07-18 | 1 | -3/+0 |
* | | | Merge pull request #3586 from mhils/issue-py38compat | Maximilian Hils | 2019-07-18 | 1 | -1/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix py38 compat | Maximilian Hils | 2019-07-18 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #3516 from pierlon/remove-confdir-argument | Maximilian Hils | 2019-07-17 | 2 | -8/+1 |
|\ \ | |||||
| * | | Remove the confdir argument | Pierre Gordon | 2019-04-09 | 2 | -8/+1 |
* | | | Merge pull request #3542 from ZHRhodes/patch-1 | Maximilian Hils | 2019-07-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Update howto-wireshark-tls.md | ZHRhodes | 2019-05-16 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3547 from felixonmars/brotli | Maximilian Hils | 2019-07-17 | 2 | -2/+2 |
|\ \ \ | |||||
| * | | | update pyinstaller | Maximilian Hils | 2019-07-17 | 1 | -1/+1 |
| * | | | Use Brotli instead of brotlipy | Felix Yan | 2019-05-27 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3525 from tonyb486/bugfix-dateheader | Maximilian Hils | 2019-07-17 | 3 | -3/+3 |
|\ \ \ | |||||
| * | | | update formatdate for cookies and tests to use GMT formatting | Anthony Biondo | 2019-04-16 | 2 | -2/+2 |
| * | | | Fix #3502 by using email.utils.formatdate's usegmt argument. | Anthony Biondo | 2019-04-16 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3580 from MathieuBordere/mathieu/3567-ReplaceMasker | Maximilian Hils | 2019-07-17 | 1 | -6/+10 |
|\ \ \ | |||||
| * | | | websockets: replace masker with more optimized one | Mathieu Borderé | 2019-07-06 | 1 | -6/+10 |
|/ / / | |||||
* | | | Merge pull request #3570 from luciopaiva/patch-1 | Thomas Kriechbaumer | 2019-07-03 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | |