aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * [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
| * | | 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 APIMaximilian Hils2017-08-162-5/+4
|/ / / /
* | | | Merge pull request #2527 from mitmproxy/revert-2511-masterThomas Kriechbaumer2017-08-151-1/+0
|\ \ \ \
| * | | | 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 instructionsMaximilian Hils2017-08-151-5/+5
|/ / / /
* | | | Merge pull request #2519 from titeuf87/no_ipv6_fallback_fixMaximilian Hils2017-08-131-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 conflictUjjwal Verma2017-08-101-0/+1
|/ /
* | 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-0815-31/+90
|\ \ \ | |/ / |/| |
| * | [web] Minor fixes.Matthew Shao2017-08-082-5/+0
| * | [web] Remove activeFetches and onMessage in StaticBackend.Matthew Shao2017-08-081-19/+1
| * | [web] Remove MITMWEB_STATIC var in tests, and update them.Matthew Shao2017-08-084-29/+13
| * | [web] update HideInStatic and some components.Matthew Shao2017-08-085-8/+20
| * | [web] Update react,react-dom,react-test-renderer to 16-beta.3Matthew Shao2017-08-082-15/+15
| * | [web] Update tests to ensure they won't be disturbed by static modeMatthew Shao2017-08-073-13/+19
| * | [web] Add HideInStatic ComponentMatthew Shao2017-08-076-13/+32
| * | [web] Add static backend.Matthew Shao2017-08-072-1/+60
| * | [web] Add static.js to index.html, containing MITMWEB_STATIC var.Matthew Shao2017-08-072-0/+2
* | | Merge pull request #2502 from mhils/optmanagerMaximilian Hils2017-08-072-3/+13
|\ \ \
| * | | fix optmanager equality check and deepcopyMaximilian Hils2017-08-052-3/+13
* | | | Merge pull request #2503 from ujjwal96/optionsMaximilian Hils2017-08-073-2/+196
|\ \ \ \
| * | | | Improve options UXUjjwal Verma2017-08-073-2/+196
* | | | | Merge pull request #2492 from mhils/addon-containsMaximilian Hils2017-08-053-8/+26
|\ \ \ \ \
| * | | | | gracefully handle errors during script loadMaximilian Hils2017-08-053-8/+26
| |/ / / /
* | | | | Merge pull request #2501 from mhils/toxxMaximilian Hils2017-08-051-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | use py36 where possibleMaximilian Hils2017-08-051-2/+2
|/ / / /
* | | | Merge pull request #2500 from mitmproxy/add-http2-switchMaximilian Hils2017-08-051-0/+1
|\ \ \ \