aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | always use 'venv' as virtualenv folderMaximilian Hils2017-01-303-18/+15
| | | |
| * | | add contributing section to README, remove autoenvMaximilian Hils2017-01-302-14/+12
| | | |
| * | | rework README dev sectionsMaximilian Hils2017-01-291-36/+25
| | | |
| * | | add contributing section that redirects to READMEMaximilian Hils2017-01-293-3/+15
| | | |
| * | | remove outdated testing section from docsMaximilian Hils2017-01-292-48/+0
| | | |
| * | | remove outdated architecture section from docsMaximilian Hils2017-01-295-15/+0
| | | |
* | | | Update shim path (#1968)Markus Unterwaditzer2017-01-301-1/+1
| | | |
* | | | :see_no_evil:Maximilian Hils2017-01-301-0/+2
|/ / /
* | | Merge pull request #1963 from cortesi/coverAldo Cortesi2017-01-295-20/+73
|\| | | | | | | | addons: unit tests to 100%
| * | addons: unit tests to 100%Aldo Cortesi2017-01-295-20/+73
|/ / | | | | | | | | This patch pushes the coverage of ./tests/mitproxy/addons to 100% of the addons module.
* | fix newlines on windowsThomas Kriechbaumer2017-01-251-5/+5
| |
* | fix alpn requirement in web testsThomas Kriechbaumer2017-01-251-1/+1
| |
* | simplify termlog outfile handlingThomas Kriechbaumer2017-01-252-22/+28
| |
* | write errors to stderr (#1952)nish212017-01-252-7/+17
| |
* | Merge pull request #1957 from s4chin/add-body-filtersMaximilian Hils2017-01-242-276/+453
|\ \ | | | | | | web: Add body filters
| * | web: Add body filtersSachin Kelkar2017-01-242-276/+453
|/ /
* | Merge pull request #1956 from Kriechi/version-stringThomas Kriechbaumer2017-01-232-1/+19
|\ \ | | | | | | improve version specifiers
| * | improve version specifiersThomas Kriechbaumer2017-01-232-1/+19
| | |
* | | Merge pull request #1945 from Kriechi/ca-expiredMaximilian Hils2017-01-2311-42/+133
|\ \ \ | | | | | | | | fix #939
| * | | fix #939Thomas Kriechbaumer2017-01-2311-42/+133
| |/ /
* | | Merge pull request #1949 from s4chin/add-src-dst-filtersMaximilian Hils2017-01-232-467/+562
|\ \ \ | | | | | | | | web: Add ~src and ~dst filters
| * | | Merge NullaryExpr, UnaryExpr and BooleanLiteralSachin Kelkar2017-01-232-421/+392
| | | |
| * | | web: Add ~src and ~dst filtersSachin Kelkar2017-01-212-132/+256
| | |/ | |/|
* | | Merge pull request #1955 from Kriechi/test++Maximilian Hils2017-01-233-1/+92
|\ \ \ | | | | | | | | increase addon test coverage
| * | | test disable_h2c_upgrade addonThomas Kriechbaumer2017-01-233-0/+19
| | | |
| * | | test websocket addonThomas Kriechbaumer2017-01-232-1/+73
| | |/ | |/|
* | | Merge branch 'offby1-patch-1'Thomas Kriechbaumer2017-01-231-2/+3
|\ \ \ | |/ / |/| |
| * | fix link to macOS and Linux binariesEric Hanchrow2017-01-231-2/+3
| |/
* | Merge pull request #1950 from Kriechi/nuke-mockMaximilian Hils2017-01-2322-28/+30
|\ \ | |/ |/| nuke mock dependency
| * nuke mock dependencyThomas Kriechbaumer2017-01-2222-28/+30
|/ | | | This is already included in Python 3.3+ as unittest.mock
* replace iOS install instructions for CAsThomas Kriechbaumer2017-01-201-1/+3
| | | | fixes #1898
* Merge pull request #1947 from s4chin/add-http-tcp-filterMaximilian Hils2017-01-202-181/+235
|\ | | | | web: Add ~http and ~tcp filters
| * web: Add ~http and ~tcp filtersSachin Kelkar2017-01-202-181/+235
|/
* Merge pull request #1940 from s4chin/add-marked-filterMaximilian Hils2017-01-204-171/+199
|\ | | | | web: Add ~marked filter
| * web: Add ~marked filterSachin Kelkar2017-01-204-171/+199
| |
* | Merge pull request #1941 from Kriechi/sysinfoThomas Kriechbaumer2017-01-1912-33/+42
|\ \ | |/ |/| provide git information with --version
| * provide git information with --versionThomas Kriechbaumer2017-01-1912-33/+42
|/ | | | fixes #1848
* Merge pull request #1932 from wufeifei/patch-2Maximilian Hils2017-01-161-2/+2
|\ | | | | update stream.py
| * update stream.pyFeei2017-01-161-2/+2
|/
* Merge pull request #1931 from wufeifei/patch-1Maximilian Hils2017-01-161-2/+2
|\ | | | | update log_events.py
| * update log_events.pyFeei2017-01-161-2/+2
|/
* Merge pull request #1923 from mhils/display-http-versionThomas Kriechbaumer2017-01-141-2/+7
|\ | | | | console: display http version in details
| * console: display http version in detailsMaximilian Hils2017-01-101-2/+7
| |
* | Merge pull request #1926 from tripleee/patch-1Maximilian Hils2017-01-131-2/+2
|\ \ | | | | | | reSt verbatim formatting error
| * | reSt verbatim formatting errortripleee2017-01-131-2/+2
|/ / | | | | The rendered code snippets would be rewrapped as if it were prose, which wreaks havoc with the code.
* | Merge pull request #1918 from s4chin/update-hacking-instructionsMaximilian Hils2017-01-101-2/+3
|\ \ | |/ |/| Update instructions in README
| * Update instructionsSachin Kelkar2017-01-061-2/+3
| |
* | clarify windows install docsMaximilian Hils2017-01-101-3/+3
| |
* | Merge pull request #1922 from mhils/read-from-stdinMaximilian Hils2017-01-101-2/+5
|\ \ | | | | | | mitmdump: fix reading from stdin
| * | mitmdump: fix reading from stdinMaximilian Hils2017-01-101-2/+5
| | |