aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
|\ | | | | Make it possible to run static viewer in subdirectories
| * [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++
| * 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
| | | | *hides*
* 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
|\ | | | | [WIP][web]Static viewer converter for mitmweb
| * [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
| | | | | | | | | | When the addon is triggered, we first copy the static resource files to the output dir, then load the `flows` file and dump json files.
| * [web] Attempt of static viewer addon.Matthew Shao2017-08-101-0/+52
| |
| * [web] Import static.js in index.htmlMatthew Shao2017-08-101-0/+1
| | | | | | | | | | This is necessary after we introducing the static mode, or it will raise an "undefined" exception.
* | Merge pull request #2534 from Kriechi/fix-depMaximilian Hils2017-08-181-1/+1
|\ \ | | | | | | bump rtool dependencies
| * | bump rtool dependenciesThomas Kriechbaumer2017-08-181-1/+1
| | |
* | | Merge pull request #2489 from MatthewShao/options-into-own-addonMaximilian Hils2017-08-1611-78/+97
|\ \ \ | | | | | | | | Move console-related options into their own addon
| * | | 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
| | | | | | | | | | | | | | | | | | | | Change console_order and console_order_reversed to view_order and view_order_reversed, and move them to the view addon.
| * | | 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
| | | |
| * | | Move console-relatived options into their own addons.Matthew Shao2017-08-012-60/+60
| | | |
* | | | Merge pull request #2530 from mhils/nicer-clienthello-alpnsMaximilian Hils2017-08-162-5/+4
|\ \ \ \ | | | | | | | | | | Improve ClientHello.alpn_protocols API
| * | | | improve ClientHello.alpn_protocols APIMaximilian Hils2017-08-162-5/+4
|/ / / /
* | | | Merge pull request #2527 from mitmproxy/revert-2511-masterThomas Kriechbaumer2017-08-151-1/+0
|\ \ \ \ | | | | | | | | | | Revert "Fix version conflict"
| * | | | Revert "Fix version conflict"Thomas Kriechbaumer2017-08-151-1/+0
|/ / / /
* | | | Merge pull request #2525 from mhils/nicer-installThomas Kriechbaumer2017-08-151-5/+5
|\ \ \ \ | | | | | | | | | | docs: simplify install instructions
| * | | | docs: simplify install instructionsMaximilian Hils2017-08-151-5/+5
|/ / / / | | | | | | | | | | | | | | | | We only need pip3 now on all OSes as cryptography now ships wheels on Linux :tada:. Also remove `pip3 install --user` recommendation because that won't end up on $PATH.
* | | | Merge pull request #2519 from titeuf87/no_ipv6_fallback_fixMaximilian Hils2017-08-131-0/+2
|\ \ \ \ | |_|/ / |/| | | Fallback correctly to ipv4 when ipv6 is not supported
| * | | Fallback correctly to ipv4 when ipv6 is not supportedSimon Vermeersch2017-08-131-0/+2
|/ / /
* | | Merge pull request #2511 from ujjwal96/masterMaximilian Hils2017-08-101-0/+1
|\ \ \ | |_|/ |/| | Fix version conflict