Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | add strutils.escape_special_areas | Maximilian Hils | 2017-08-24 | 2 | -1/+108 | |
|/ | ||||||
* | update mitmweb assets (gulp prod) | Maximilian Hils | 2017-08-22 | 4 | -70540/+294 | |
| | ||||||
* | [web] make it possible to run static viewer in subdirectories | Maximilian Hils | 2017-08-22 | 2 | -1/+4 | |
| | ||||||
* | Merge pull request #2540 from mhils/relatively-static | Maximilian Hils | 2017-08-22 | 16 | -24/+28 | |
|\ | | | | | Make it possible to run static viewer in subdirectories | |||||
| * | [web] make it possible to run static viewer in subdirectories | Maximilian Hils | 2017-08-21 | 16 | -24/+28 | |
| | | ||||||
* | | Merge pull request #2539 from mhils/fix-mitmweb-shutdown | Maximilian Hils | 2017-08-22 | 3 | -1/+28 | |
|\ \ | |/ |/| | Fix mitmweb master shutdown, tests++ | |||||
| * | fix mitmweb master shutdown, tests++ | Maximilian Hils | 2017-08-21 | 3 | -1/+28 | |
| | | ||||||
* | | fix gulpfile copy mistake | Maximilian Hils | 2017-08-21 | 1 | -1/+1 | |
|/ | ||||||
* | actually fix tests | Maximilian Hils | 2017-08-21 | 1 | -1/+1 | |
| | | | | *hides* | |||||
* | fix tests | Maximilian Hils | 2017-08-21 | 1 | -1/+1 | |
| | ||||||
* | move tests... | Maximilian Hils | 2017-08-21 | 1 | -0/+0 | |
| | ||||||
* | move static viewer to fix pyinstaller | Maximilian Hils | 2017-08-21 | 2 | -2/+1 | |
| | ||||||
* | travis: build binaries on precise to lessen glibc reqs, refs #2445 | Maximilian Hils | 2017-08-21 | 1 | -0/+1 | |
| | ||||||
* | Merge pull request #2510 from MatthewShao/static-viewer | Maximilian Hils | 2017-08-21 | 17 | -28/+197 | |
|\ | | | | | [WIP][web]Static viewer converter for mitmweb | |||||
| * | [web] Move static viewer from default addon to WebMaster. | Matthew Shao | 2017-08-21 | 2 | -2/+2 | |
| | | ||||||
| * | [web] Static_viewer coverage ++. | Matthew Shao | 2017-08-17 | 1 | -2/+5 | |
| | | ||||||
| * | [web] Add tests for StaticViewer and minor fixes. | Matthew Shao | 2017-08-17 | 2 | -13/+76 | |
| | | ||||||
| * | [web] Minor fixes. | Matthew Shao | 2017-08-17 | 1 | -8/+11 | |
| | | ||||||
| * | make static viewer more testable, print slow contentviews | Maximilian Hils | 2017-08-16 | 4 | -106/+96 | |
| | | ||||||
| * | [web] Update tests. | Matthew Shao | 2017-08-16 | 8 | -15/+15 | |
| | | ||||||
| * | [web] Change the api routing and minor fix. | Matthew Shao | 2017-08-15 | 5 | -34/+13 | |
| | | ||||||
| * | [web] change the path name like `_flows` to `flows.json`. | Matthew Shao | 2017-08-14 | 3 | -9/+9 | |
| | | ||||||
| * | [web] Hide ContentViewOptions in static mode | Matthew Shao | 2017-08-12 | 1 | -0/+5 | |
| | | ||||||
| * | [web] Update fetch api to suite the static mode. | Matthew Shao | 2017-08-12 | 2 | -2/+23 | |
| | | ||||||
| * | [web] Update static_viewer addon. | Matthew Shao | 2017-08-12 | 1 | -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 Shao | 2017-08-10 | 1 | -0/+52 | |
| | | ||||||
| * | [web] Import static.js in index.html | Matthew Shao | 2017-08-10 | 1 | -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-dep | Maximilian Hils | 2017-08-18 | 1 | -1/+1 | |
|\ \ | | | | | | | bump rtool dependencies | |||||
| * | | bump rtool dependencies | Thomas Kriechbaumer | 2017-08-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2489 from MatthewShao/options-into-own-addon | Maximilian Hils | 2017-08-16 | 11 | -78/+97 | |
|\ \ \ | | | | | | | | | Move console-related options into their own addon | |||||
| * | | | Add test for AddonManager.__contains__ | Matthew Shao | 2017-08-08 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | Add console_focus_follow in view and eventlog addons. | Matthew Shao | 2017-08-05 | 3 | -35/+34 | |
| | | | | ||||||
| * | | | Fix lint. | Matthew Shao | 2017-08-05 | 3 | -4/+3 | |
| | | | | ||||||
| * | | | Add consoleaddons.common_options to suggest dependency. | Matthew Shao | 2017-08-04 | 3 | -26/+36 | |
| | | | | ||||||
| * | | | Update taddon and tests. | Matthew Shao | 2017-08-03 | 4 | -9/+8 | |
| | | | | ||||||
| * | | | Update tests. | Matthew Shao | 2017-08-01 | 3 | -14/+23 | |
| | | | | ||||||
| * | | | Change console_order and console_order_reversed options | Matthew Shao | 2017-08-01 | 3 | -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 Shao | 2017-08-01 | 1 | -3/+0 | |
| | | | | ||||||
| * | | | Adjust --verbose options to string type. | Matthew Shao | 2017-08-01 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Update tests. | Matthew Shao | 2017-08-01 | 2 | -6/+8 | |
| | | | | ||||||
| * | | | Move console-relatived options into their own addons. | Matthew Shao | 2017-08-01 | 2 | -60/+60 | |
| | | | | ||||||
* | | | | Merge pull request #2530 from mhils/nicer-clienthello-alpns | Maximilian Hils | 2017-08-16 | 2 | -5/+4 | |
|\ \ \ \ | | | | | | | | | | | Improve ClientHello.alpn_protocols API | |||||
| * | | | | improve ClientHello.alpn_protocols API | Maximilian Hils | 2017-08-16 | 2 | -5/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #2527 from mitmproxy/revert-2511-master | Thomas Kriechbaumer | 2017-08-15 | 1 | -1/+0 | |
|\ \ \ \ | | | | | | | | | | | Revert "Fix version conflict" | |||||
| * | | | | Revert "Fix version conflict" | Thomas Kriechbaumer | 2017-08-15 | 1 | -1/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #2525 from mhils/nicer-install | Thomas Kriechbaumer | 2017-08-15 | 1 | -5/+5 | |
|\ \ \ \ | | | | | | | | | | | docs: simplify install instructions | |||||
| * | | | | docs: simplify install instructions | Maximilian Hils | 2017-08-15 | 1 | -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_fix | Maximilian Hils | 2017-08-13 | 1 | -0/+2 | |
|\ \ \ \ | |_|/ / |/| | | | Fallback correctly to ipv4 when ipv6 is not supported | |||||
| * | | | Fallback correctly to ipv4 when ipv6 is not supported | Simon Vermeersch | 2017-08-13 | 1 | -0/+2 | |
|/ / / | ||||||
* | | | Merge pull request #2511 from ujjwal96/master | Maximilian Hils | 2017-08-10 | 1 | -0/+1 | |
|\ \ \ | |_|/ |/| | | Fix version conflict |