aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* move hostname validation into mitmproxy.net.tlsMaximilian Hils2017-09-047-136/+145
* split TLS parts from net.tcp into net.tlsMaximilian Hils2017-09-0310-313/+355
* fix #2477 (#2556)Suraj Tripathi2017-09-011-1/+1
* Merge pull request #2551 from MatthewShao/static-viewerMaximilian Hils2017-08-313-0/+13
|\
| * [web] Update test for static viewer.Matthew Shao2017-08-301-0/+6
| * [web] Add settings.json to static viewer, so it can display version.Matthew Shao2017-08-302-0/+7
|/
* Merge pull request #2542 from mhils/fast-cssMaximilian Hils2017-08-2625-37/+425
|\
| * fix strutils.split_special_areasMaximilian Hils2017-08-262-2/+10
| * remove cssutils dependencyMaximilian Hils2017-08-241-1/+0
| * add new, faster css prettifier :tada:Maximilian Hils2017-08-2422-35/+309
| * add strutils.escape_special_areasMaximilian Hils2017-08-242-1/+108
|/
* update mitmweb assets (gulp prod)Maximilian Hils2017-08-224-70540/+294
* [web] make it possible to run static viewer in subdirectoriesMaximilian Hils2017-08-222-1/+4
* Merge pull request #2540 from mhils/relatively-staticMaximilian Hils2017-08-2216-24/+28
|\
| * [web] make it possible to run static viewer in subdirectoriesMaximilian Hils2017-08-2116-24/+28
* | Merge pull request #2539 from mhils/fix-mitmweb-shutdownMaximilian Hils2017-08-223-1/+28
|\ \ | |/ |/|
| * fix mitmweb master shutdown, tests++Maximilian Hils2017-08-213-1/+28
* | fix gulpfile copy mistakeMaximilian Hils2017-08-211-1/+1
|/
* actually fix testsMaximilian Hils2017-08-211-1/+1
* fix testsMaximilian Hils2017-08-211-1/+1
* move tests...Maximilian Hils2017-08-211-0/+0
* move static viewer to fix pyinstallerMaximilian Hils2017-08-212-2/+1
* travis: build binaries on precise to lessen glibc reqs, refs #2445Maximilian Hils2017-08-211-0/+1
* Merge pull request #2510 from MatthewShao/static-viewerMaximilian Hils2017-08-2117-28/+197
|\
| * [web] Move static viewer from default addon to WebMaster.Matthew Shao2017-08-212-2/+2
| * [web] Static_viewer coverage ++.Matthew Shao2017-08-171-2/+5
| * [web] Add tests for StaticViewer and minor fixes.Matthew Shao2017-08-172-13/+76
| * [web] Minor fixes.Matthew Shao2017-08-171-8/+11
| * make static viewer more testable, print slow contentviewsMaximilian Hils2017-08-164-106/+96
| * [web] Update tests.Matthew Shao2017-08-168-15/+15
| * [web] Change the api routing and minor fix.Matthew Shao2017-08-155-34/+13
| * [web] change the path name like `_flows` to `flows.json`.Matthew Shao2017-08-143-9/+9
| * [web] Hide ContentViewOptions in static modeMatthew Shao2017-08-121-0/+5
| * [web] Update fetch api to suite the static mode.Matthew Shao2017-08-122-2/+23
| * [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 #2534 from Kriechi/fix-depMaximilian Hils2017-08-181-1/+1
|\ \
| * | bump rtool dependenciesThomas Kriechbaumer2017-08-181-1/+1
* | | Merge pull request #2489 from MatthewShao/options-into-own-addonMaximilian Hils2017-08-1611-78/+97
|\ \ \
| * | | Add test for AddonManager.__contains__Matthew Shao2017-08-081-0/+2
| * | | Add console_focus_follow in view and eventlog addons.Matthew Shao2017-08-053-35/+34
| * | | Fix lint.Matthew Shao2017-08-053-4/+3
| * | | Add consoleaddons.common_options to suggest dependency.Matthew Shao2017-08-043-26/+36
| * | | Update taddon and tests.Matthew Shao2017-08-034-9/+8
| * | | Update tests.Matthew Shao2017-08-013-14/+23
| * | | 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
| * | | Update tests.Matthew Shao2017-08-012-6/+8