aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * minor fixesMaximilian Hils2017-07-302-5/+5
| |
| * move isatty check to a better placeMaximilian Hils2017-07-302-6/+5
| |
| * fix tflow.js creation on Windows.Maximilian Hils2017-07-301-1/+1
| | | | | | | | | | Keep lineendings consistent so that running the tests does not produce a different file on Windows.
| * fix tool-specific cmdlineMaximilian Hils2017-07-304-30/+34
| | | | | | | | | | | | | | before this commit, all tools only exposed mitmdump cmdline arguments, as run() contained a simple `cmdline.mitmdump()` invocation. This fixes this, and also makes it possible to have cmdline arguments for tool-specific options.
| * disentangle ProxyServer and Master classes.Maximilian Hils2017-07-3023-121/+130
| | | | | | | | | | | | The proxy server should ultimately be an addon itself and not be passed to the Master constructor. This commit already removes the server in the majority of instances, and also replaces a large number of ProxyConfig usages with the Options class..
| * move web options into their own addonMaximilian Hils2017-07-293-19/+20
| |
* | Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-302-1/+20
|\ \ | | | | | | Make option redeclaration silent if signature is the same
| * | make option redeclaration silent if signature is the sameMaximilian Hils2017-07-302-1/+20
| | |
* | | Merge pull request #2482 from mhils/pure-script-loadMaximilian Hils2017-07-303-51/+43
|\ \ \ | |/ / |/| | Make load_script pure
| * | make load_script pureMaximilian Hils2017-07-303-51/+43
| |/
* | Merge pull request #2483 from mhils/ignore-imports-with-hook-namesMaximilian Hils2017-07-302-3/+16
|\ \ | | | | | | Gracefully ignore imports with hook names
| * | gracefully ignore imports with hook namesMaximilian Hils2017-07-292-3/+16
| |/
* | Merge pull request #2481 from mhils/option-typehintsMaximilian Hils2017-07-305-3/+123
|\ \ | |/ |/| Add type hints for options.
| * fix type hints for mitmproxy.ctxMaximilian Hils2017-07-291-3/+3
| |
| * add option type hintsMaximilian Hils2017-07-292-0/+113
| |
| * add OptManager.itemsMaximilian Hils2017-07-292-0/+7
|/
* Merge pull request #2452 from mattweidner/add_intercept_toggleMaximilian Hils2017-07-297-1/+31
|\ | | | | Add intercept toggle feature.
| * Extended intercept tests to include toggle featureMatt Weidner2017-07-271-0/+12
| |
| * Changed statusbar indicator to 'X' inside the intercept filter bracketsMatt Weidner2017-07-271-2/+2
| |
| * Fixed boolean evaluation syntax inconsistencyMatt Weidner2017-07-271-1/+1
| |
| * Fixed indentationMatt Weidner2017-07-271-2/+2
| |
| * Add intercetp toggle feature.Matt Weidner2017-07-276-1/+19
| |
* | Merge pull request #2480 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-299-10/+24
|\ \ | | | | | | Fix #2448: Improve flow_detail and verbosity options
| * | Fix lint error.Matthew Shao2017-07-281-1/+1
| | |
| * | Update tests for the improved verbosity options.Matthew Shao2017-07-284-4/+4
| | |
| * | Improve verbosity options.Matthew Shao2017-07-285-6/+20
| |/
* | Merge pull request #2471 from ujjwal96/traceback-fixMaximilian Hils2017-07-297-15/+19
|\ \ | | | | | | Fixed addon error in test suite
| * | updated snapshotUjjwal Verma2017-07-281-2/+2
| | |
| * | fixed addon errorUjjwal Verma2017-07-266-13/+17
| | |
* | | Merge pull request #2478 from pauloromeira/fix-typoThomas Kriechbaumer2017-07-291-3/+3
|\ \ \ | |_|/ |/| | docs: Fix typo
| * | docs: Fix typoPaulo Romeira2017-07-291-3/+3
|/ /
* | Merge pull request #2476 from mhils/statusbar-testsMaximilian Hils2017-07-273-11/+46
|\ \ | | | | | | Add console statusbar test
| * | add console statusbar testMaximilian Hils2017-07-273-11/+46
|/ /
* | Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2711-6/+217
|\ \ | | | | | | Add default value suggester in mitmweb options
| * | [web] Minor fix for frontend and tests.Matthew Shao2017-07-273-8/+11
| | |
| * | [web] Minor Fix for backend.Matthew Shao2017-07-273-15/+6
| | |
| * | [web] Fix tests.Matthew Shao2017-07-262-5/+1
| | |
| * | [web] Fix conflict.Matthew Shao2017-07-262-12/+8
| | |
| * | [web] Update tests.Matthew Shao2017-07-265-41/+20
| | |
| * | [web] Load dumped options at start up.Matthew Shao2017-07-261-0/+6
| | |
| * | [web] Update options auto dump for frontend.Matthew Shao2017-07-263-26/+6
| | |
| * | [web] Update POST /options/dump API in backend.Matthew Shao2017-07-261-9/+3
| | |
| * | [web] Update tests.Matthew Shao2017-07-243-2/+44
| | |
| * | [web] Add Download/Load button to OptionEditor.Matthew Shao2017-07-242-1/+28
| | |
| * | [web] Add /options/dump API to backend.Matthew Shao2017-07-241-1/+18
| | |
| * | [web] Update OptManager.save() to suit the need of mitmweb.Matthew Shao2017-07-241-5/+11
| | |
| * | [web] OptionModal component coverge ++.Matthew Shao2017-07-223-1/+116
| | |
| * | [web] Update tests.Matthew Shao2017-07-211-0/+33
| | |
| * | [web] Add default value suggester in option editor.Matthew Shao2017-07-211-0/+27
| | |
* | | Merge pull request #2473 from mengbiping/postpone-connectionMaximilian Hils2017-07-261-10/+13
|\ \ \ | | | | | | | | Respect response to CONNECT created in http_connect function in upstream mode