aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename TLS/SSL-related functionsThomas Kriechbaumer2018-01-0619-63/+63
* rename TLS/SSL-related attributesThomas Kriechbaumer2018-01-0617-69/+79
* Merge pull request #2759 from mhils/issue-1833Maximilian Hils2018-01-0513-148/+184
|\
| * fix #1833Maximilian Hils2018-01-051-1/+24
| * refactor common.format_keyvalsMaximilian Hils2018-01-056-98/+117
| * minor fixesMaximilian Hils2018-01-053-20/+18
| * fix test flow timestamps to values that don't overflow in certain timezonesMaximilian Hils2018-01-056-29/+25
|/
* Merge pull request #2754 from mhils/issue-2470Thomas Kriechbaumer2018-01-042-2/+5
|\
| * fix #2470Maximilian Hils2018-01-042-2/+5
* | dependency updateMaximilian Hils2018-01-041-1/+1
* | Bugs with console fixed. (#2746)Samoilenko Roman2018-01-041-1/+10
* | Merge pull request #2755 from mhils/fix-unfocused-pane-clickMaximilian Hils2018-01-041-14/+20
|\ \ | |/ |/|
| * fix #2738Maximilian Hils2018-01-041-14/+20
* | Merge pull request #2756 from mitmproxy/pyinstallerMaximilian Hils2018-01-048-4/+12
|\ \
| * | do not add leading zeroes to .dev version part.Maximilian Hils2018-01-042-2/+2
| * | pin snapshot server hostkey, update pysftpMaximilian Hils2018-01-046-2/+10
|/ /
* | Merge pull request #2745 from bksahu/patch-1Maximilian Hils2018-01-045-49/+125
|\ \
| * | don't use red text for informational messageMaximilian Hils2018-01-041-1/+1
| * | Added favicon and logos in /static/imagesbksahu2018-01-022-0/+0
| * | Added logos to mitm.itbksahu2018-01-023-6/+6
| * | Additional OSes/software added to the listbksahu2018-01-023-44/+120
* | | Merge pull request #2742 from mhils/dataviewer-fix-editMaximilian Hils2018-01-044-75/+52
|\ \ \
| * | | dataviewer: disable (broken) editMaximilian Hils2018-01-024-75/+52
| | |/ | |/|
* | | fix broken linkMaximilian Hils2018-01-021-1/+1
* | | Fix crash when using body filters (#2744)Wouter Visser2018-01-022-7/+7
* | | docs: minor improvementsMaximilian Hils2018-01-011-1/+1
* | | Merge pull request #2741 from Kriechi/unvendor-wsprotoThomas Kriechbaumer2018-01-019-1440/+11
|\ \ \ | |/ / |/| |
| * | unvendor wsprotoThomas Kriechbaumer2018-01-019-1440/+11
|/ /
* | minor fixesMaximilian Hils2017-12-312-1/+5
* | Merge pull request #2733 from mitmproxy/pyinstallerMaximilian Hils2017-12-3011-118/+165
|\ \
| * | update installbuilderMaximilian Hils2017-12-301-1/+1
| * | fix #2470Maximilian Hils2017-12-301-2/+3
| * | fix appveyor build scriptMaximilian Hils2017-12-303-4/+2
| * | single-source version processingMaximilian Hils2017-12-306-67/+95
| * | rtool: include dev version in binariesMaximilian Hils2017-12-294-37/+77
| * | tox.ini: python3 -> pythonMaximilian Hils2017-12-291-2/+2
| * | remove rtool's setup.py, embrace toxMaximilian Hils2017-12-292-23/+3
| * | update rtool dependenciesMaximilian Hils2017-12-261-1/+1
| * | make sure that mitmproxy/rtool dependencies don't clashMaximilian Hils2017-12-261-0/+1
| * | update pyinstaller :pray:Maximilian Hils2017-12-261-2/+1
* | | Merge pull request #2703 from mhils/test-defaultkeysMaximilian Hils2017-12-302-6/+33
|\ \ \ | |_|/ |/| |
| * | test that defaultkeys are valid commandsMaximilian Hils2017-12-292-6/+33
| |/
* | Merge pull request #2732 from mitmproxy/websocket-flow-killMaximilian Hils2017-12-294-16/+32
|\ \
| * | fix Flow.kill behaviourMaximilian Hils2017-12-294-18/+15
| * | websocket: add flow kill testThomas Kriechbaumer2017-12-291-0/+19
|/ /
* | Merge pull request #2728 from Kriechi/websocket++Thomas Kriechbaumer2017-12-295-15/+68
|\ \
| * | websocket: test killableThomas Kriechbaumer2017-12-281-0/+15
| * | websocket: docs++ and kill messagesThomas Kriechbaumer2017-12-275-15/+53
|/ /
* / Display "*" when listening on all interfacesMaximilian Hils2017-12-262-0/+4
|/
* @concurrent decorator works for class methods. (#2708)fate02017-12-262-8/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 10:20:34 +0000