aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3329 from Kriechi/readme-sloganThomas Kriechbaumer2019-09-284-10/+11
|\
| * update readme sloganThomas Kriechbaumer2018-09-214-10/+11
* | Merge pull request #3651 from Kriechi/bump-depsThomas Kriechbaumer2019-09-284-11/+12
|\ \
| * | bump dependenciesThomas Kriechbaumer2019-09-284-11/+12
|/ /
* | Merge pull request #3560 from travelperk/add-refresh-optionThomas Kriechbaumer2019-09-281-0/+1
|\ \
| * | Add refresh option to disable cookiesJavier Tejero2019-06-051-0/+1
* | | Merge pull request #3594 from Jessonsotoventura/open_editorThomas Kriechbaumer2019-09-281-1/+6
|\ \ \
| * | | Edit URL now opens the external editorJesson Soto Ventura2019-07-221-1/+6
* | | | Merge pull request #3650 from Kriechi/fix-lintingThomas Kriechbaumer2019-09-282-2/+1
|\ \ \ \
| * | | | fix lintingThomas Kriechbaumer2019-09-282-2/+1
|/ / / /
* | | | Merge pull request #3464 from rjt-gupta/url-fixThomas Kriechbaumer2019-09-282-6/+31
|\ \ \ \
| * | | | url-fixrjt-gupta2019-02-031-6/+15
| * | | | non ascii fix and testsrjt-gupta2019-02-031-0/+16
* | | | | Merge pull request #3486 from rjt-gupta/unicode-filterThomas Kriechbaumer2019-09-282-0/+46
|\ \ \ \ \
| * | | | | filter unicode fixrjt-gupta2019-02-242-0/+46
| |/ / / /
* | | | | Merge pull request #3526 from pierlon/feature/allow-hostsThomas Kriechbaumer2019-09-287-17/+91
|\ \ \ \ \
| * | | | | Only handle types "allow", "ignore" & "tcp"Pierre Gordon2019-04-191-3/+1
| * | | | | Verify ignore_hosts & allow_hosts are mutually exclusivePierre Gordon2019-04-192-1/+10
| * | | | | Add --allow_hosts optionPierre Gordon2019-04-196-15/+82
| | |_|/ / | |/| | |
* | | | | Merge pull request #3603 from tomsaleeba/patch-1Thomas Kriechbaumer2019-09-281-0/+25
|\ \ \ \ \
| * | | | | docs: correct command to install mitmproxyTom Saleeba2019-08-011-1/+3
| * | | | | docs: add instructions for transparent proxy on Linux for traffic originating...Tom Saleeba2019-08-011-0/+23
| | |_|/ / | |/| | |
* | | | | Merge pull request #3600 from king6cong/masterThomas Kriechbaumer2019-09-281-11/+5
|\ \ \ \ \
| * | | | | fix pf.conf on macOSking6cong2019-07-301-11/+5
| |/ / / /
* | | | | Merge pull request #3646 from ahopkins/patch-1Thomas Kriechbaumer2019-09-281-0/+3
|\ \ \ \ \
| * | | | | Update concepts-certificates.mdAdam Hopkins2019-09-241-0/+3
* | | | | | Merge pull request #3648 from Eluch/masterThomas Kriechbaumer2019-09-281-1/+1
|\ \ \ \ \ \
| * | | | | | ssl_insecure added to option_whitelist because it was missingFerenc soós2019-09-271-1/+1
|/ / / / / /
* | | | | | Merge pull request #3593 from Jessonsotoventura/tabularMaximilian Hils2019-09-269-25/+496
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Updated Setup.pyJesson Soto Ventura2019-09-241-1/+1
| * | | | | Merge branch 'master' into tabularJesson Soto Ventura2019-09-2412-24/+48
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #3631 from mhils/lintMaximilian Hils2019-09-056-18/+17
|\ \ \ \ \ \
| * | | | | | lintMaximilian Hils2019-09-056-18/+17
* | | | | | | Merge pull request #3627 from RamiBerm/patch-1Maximilian Hils2019-09-051-1/+4
|\ \ \ \ \ \ \
| * | | | | | | make dict comprehension more readableMaximilian Hils2019-09-051-1/+4
| * | | | | | | Updated har_dump,py timings dictionary functionRamiBerm2019-09-031-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #3630 from tsaaristo/encode-zstandardMaximilian Hils2019-09-056-5/+27
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | encoding: add support for zstd (zstandard)Tero Saaristo2019-09-056-5/+27
| |/ / / / /
* / / / / / lintMaximilian Hils2019-09-051-0/+1
|/ / / / /
| * | | | Fixed Duration on list viewJesson Soto Ventura2019-09-241-2/+3
| * | | | TLD and SLD are now highlighted using publicsuffixJesson Soto Ventura2019-09-243-17/+26
| * | | | Fixed linting issuesJesson Soto Ventura2019-07-217-17/+17
| * | | | Added console_flowlist_layout optionJesson Soto Ventura2019-07-215-13/+125
| * | | | Merge branch 'tabular' of github.com:Jessonsotoventura/mitmproxy into tabularJesson Soto Ventura2019-07-211-1/+8
| |\ \ \ \
| | * | | | Added Color palettes for lowlight, lowdark, solarized light, and solarized darkJesson Soto Ventura2019-07-212-6/+67
| * | | | | Merge branch 'tabular' of https://github.com/BkPHcgQL3V/mitmproxy into tabularJesson Soto Ventura2019-07-211-1/+2
| |\| | | |
| | * | | | Tabular list flowBkPHcgQL3V2018-12-194-75/+356
| * | | | | Added Color palettes for lowlight, lowdark, solarized light, and solarized darkJesson Soto Ventura2019-07-212-6/+67
| * | | | | Tabular list flowBkPHcgQL3V2019-07-214-75/+356
|/ / / / /
* | | | | Merge pull request #3591 from mhils/miscMaximilian Hils2019-07-191-1/+1
|\ \ \ \ \