aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2602 from mhils/simplify-versionMaximilian Hils2017-10-242-54/+33
|\
| * simplify version outputMaximilian Hils2017-10-242-54/+33
* | fix urwid display on WSLMaximilian Hils2017-10-233-2/+19
|/
* Fix typo in the docstring of flowfilterRadoslav Gerganov2017-10-101-1/+1
* remove html outline contentview, fix #2572Maximilian Hils2017-09-142-19/+1
* Merge pull request #2537 from ujjwal96/content-viewMaximilian Hils2017-09-044-27/+59
|\
| * remove jsbeautifier dependencyMaximilian Hils2017-09-031-6/+1
| * make split_special_areas more flexible, refs #2537Maximilian Hils2017-09-032-16/+14
| * JS beautifierUjjwal Verma2017-09-031-5/+44
* | move hostname validation into mitmproxy.net.tlsMaximilian Hils2017-09-043-102/+107
* | split TLS parts from net.tcp into net.tlsMaximilian Hils2017-09-034-267/+305
|/
* [web] Add settings.json to static viewer, so it can display version.Matthew Shao2017-08-301-0/+6
* fix strutils.split_special_areasMaximilian Hils2017-08-261-2/+2
* add new, faster css prettifier :tada:Maximilian Hils2017-08-241-11/+56
* add strutils.escape_special_areasMaximilian Hils2017-08-241-1/+86
* update mitmweb assets (gulp prod)Maximilian Hils2017-08-224-70540/+294
* Merge pull request #2540 from mhils/relatively-staticMaximilian Hils2017-08-222-2/+2
|\
| * [web] make it possible to run static viewer in subdirectoriesMaximilian Hils2017-08-212-2/+2
* | fix mitmweb master shutdown, tests++Maximilian Hils2017-08-211-1/+4
|/
* actually fix testsMaximilian Hils2017-08-211-1/+1
* move static viewer to fix pyinstallerMaximilian Hils2017-08-212-2/+1
* Merge pull request #2510 from MatthewShao/static-viewerMaximilian Hils2017-08-214-9/+110
|\
| * [web] Move static viewer from default addon to WebMaster.Matthew Shao2017-08-212-2/+2
| * [web] Add tests for StaticViewer and minor fixes.Matthew Shao2017-08-171-13/+16
| * [web] Minor fixes.Matthew Shao2017-08-171-8/+11
| * make static viewer more testable, print slow contentviewsMaximilian Hils2017-08-164-106/+96
| * [web] Change the api routing and minor fix.Matthew Shao2017-08-152-8/+8
| * [web] change the path name like `_flows` to `flows.json`.Matthew Shao2017-08-141-6/+6
| * [web] Update static_viewer addon.Matthew Shao2017-08-121-21/+73
| * [web] Attempt of static viewer addon.Matthew Shao2017-08-101-0/+52
| * [web] Import static.js in index.htmlMatthew Shao2017-08-101-0/+1
* | Merge pull request #2489 from MatthewShao/options-into-own-addonMaximilian Hils2017-08-168-70/+85
|\ \
| * | Add console_focus_follow in view and eventlog addons.Matthew Shao2017-08-053-35/+34
| * | Fix lint.Matthew Shao2017-08-051-1/+2
| * | Add consoleaddons.common_options to suggest dependency.Matthew Shao2017-08-043-26/+36
| * | Update taddon and tests.Matthew Shao2017-08-032-2/+6
| * | Update tests.Matthew Shao2017-08-011-0/+2
| * | Change console_order and console_order_reversed optionsMatthew Shao2017-08-013-18/+20
| * | Remove redundant comment.Matthew Shao2017-08-011-3/+0
| * | Adjust --verbose options to string type.Matthew Shao2017-08-011-1/+1
| * | Move console-relatived options into their own addons.Matthew Shao2017-08-012-60/+60
* | | improve ClientHello.alpn_protocols APIMaximilian Hils2017-08-161-3/+3
* | | Fallback correctly to ipv4 when ipv6 is not supportedSimon Vermeersch2017-08-131-0/+2
| |/ |/|
* | Merge pull request #2509 from ujjwal96/compatMaximilian Hils2017-08-091-1/+1
|\ \
| * | Fixes #2495Ujjwal Verma2017-08-101-1/+1
* | | Merge pull request #2504 from MatthewShao/static-viewerMaximilian Hils2017-08-081-0/+1
|\ \ \ | |/ / |/| |
| * | [web] Add static.js to index.html, containing MITMWEB_STATIC var.Matthew Shao2017-08-071-0/+1
* | | Merge pull request #2502 from mhils/optmanagerMaximilian Hils2017-08-071-3/+7
|\ \ \
| * | | fix optmanager equality check and deepcopyMaximilian Hils2017-08-051-3/+7
* | | | Merge pull request #2503 from ujjwal96/optionsMaximilian Hils2017-08-072-2/+160
|\ \ \ \