Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | minor fixes | Maximilian Hils | 2017-07-30 | 2 | -5/+5 | |
| | | ||||||
| * | move isatty check to a better place | Maximilian Hils | 2017-07-30 | 2 | -6/+5 | |
| | | ||||||
| * | fix tflow.js creation on Windows. | Maximilian Hils | 2017-07-30 | 1 | -1/+1 | |
| | | | | | | | | | | Keep lineendings consistent so that running the tests does not produce a different file on Windows. | |||||
| * | fix tool-specific cmdline | Maximilian Hils | 2017-07-30 | 4 | -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 Hils | 2017-07-30 | 23 | -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 addon | Maximilian Hils | 2017-07-29 | 3 | -19/+20 | |
| | | ||||||
* | | Merge pull request #2485 from mhils/silent-option-redeclaration | Maximilian Hils | 2017-07-30 | 2 | -1/+20 | |
|\ \ | | | | | | | Make option redeclaration silent if signature is the same | |||||
| * | | make option redeclaration silent if signature is the same | Maximilian Hils | 2017-07-30 | 2 | -1/+20 | |
| | | | ||||||
* | | | Merge pull request #2482 from mhils/pure-script-load | Maximilian Hils | 2017-07-30 | 3 | -51/+43 | |
|\ \ \ | |/ / |/| | | Make load_script pure | |||||
| * | | make load_script pure | Maximilian Hils | 2017-07-30 | 3 | -51/+43 | |
| |/ | ||||||
* | | Merge pull request #2483 from mhils/ignore-imports-with-hook-names | Maximilian Hils | 2017-07-30 | 2 | -3/+16 | |
|\ \ | | | | | | | Gracefully ignore imports with hook names | |||||
| * | | gracefully ignore imports with hook names | Maximilian Hils | 2017-07-29 | 2 | -3/+16 | |
| |/ | ||||||
* | | Merge pull request #2481 from mhils/option-typehints | Maximilian Hils | 2017-07-30 | 5 | -3/+123 | |
|\ \ | |/ |/| | Add type hints for options. | |||||
| * | fix type hints for mitmproxy.ctx | Maximilian Hils | 2017-07-29 | 1 | -3/+3 | |
| | | ||||||
| * | add option type hints | Maximilian Hils | 2017-07-29 | 2 | -0/+113 | |
| | | ||||||
| * | add OptManager.items | Maximilian Hils | 2017-07-29 | 2 | -0/+7 | |
|/ | ||||||
* | Merge pull request #2452 from mattweidner/add_intercept_toggle | Maximilian Hils | 2017-07-29 | 7 | -1/+31 | |
|\ | | | | | Add intercept toggle feature. | |||||
| * | Extended intercept tests to include toggle feature | Matt Weidner | 2017-07-27 | 1 | -0/+12 | |
| | | ||||||
| * | Changed statusbar indicator to 'X' inside the intercept filter brackets | Matt Weidner | 2017-07-27 | 1 | -2/+2 | |
| | | ||||||
| * | Fixed boolean evaluation syntax inconsistency | Matt Weidner | 2017-07-27 | 1 | -1/+1 | |
| | | ||||||
| * | Fixed indentation | Matt Weidner | 2017-07-27 | 1 | -2/+2 | |
| | | ||||||
| * | Add intercetp toggle feature. | Matt Weidner | 2017-07-27 | 6 | -1/+19 | |
| | | ||||||
* | | Merge pull request #2480 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-29 | 9 | -10/+24 | |
|\ \ | | | | | | | Fix #2448: Improve flow_detail and verbosity options | |||||
| * | | Fix lint error. | Matthew Shao | 2017-07-28 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update tests for the improved verbosity options. | Matthew Shao | 2017-07-28 | 4 | -4/+4 | |
| | | | ||||||
| * | | Improve verbosity options. | Matthew Shao | 2017-07-28 | 5 | -6/+20 | |
| |/ | ||||||
* | | Merge pull request #2471 from ujjwal96/traceback-fix | Maximilian Hils | 2017-07-29 | 7 | -15/+19 | |
|\ \ | | | | | | | Fixed addon error in test suite | |||||
| * | | updated snapshot | Ujjwal Verma | 2017-07-28 | 1 | -2/+2 | |
| | | | ||||||
| * | | fixed addon error | Ujjwal Verma | 2017-07-26 | 6 | -13/+17 | |
| | | | ||||||
* | | | Merge pull request #2478 from pauloromeira/fix-typo | Thomas Kriechbaumer | 2017-07-29 | 1 | -3/+3 | |
|\ \ \ | |_|/ |/| | | docs: Fix typo | |||||
| * | | docs: Fix typo | Paulo Romeira | 2017-07-29 | 1 | -3/+3 | |
|/ / | ||||||
* | | Merge pull request #2476 from mhils/statusbar-tests | Maximilian Hils | 2017-07-27 | 3 | -11/+46 | |
|\ \ | | | | | | | Add console statusbar test | |||||
| * | | add console statusbar test | Maximilian Hils | 2017-07-27 | 3 | -11/+46 | |
|/ / | ||||||
* | | Merge pull request #2460 from MatthewShao/mitmweb-options | Maximilian Hils | 2017-07-27 | 11 | -6/+217 | |
|\ \ | | | | | | | Add default value suggester in mitmweb options | |||||
| * | | [web] Minor fix for frontend and tests. | Matthew Shao | 2017-07-27 | 3 | -8/+11 | |
| | | | ||||||
| * | | [web] Minor Fix for backend. | Matthew Shao | 2017-07-27 | 3 | -15/+6 | |
| | | | ||||||
| * | | [web] Fix tests. | Matthew Shao | 2017-07-26 | 2 | -5/+1 | |
| | | | ||||||
| * | | [web] Fix conflict. | Matthew Shao | 2017-07-26 | 2 | -12/+8 | |
| | | | ||||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-26 | 5 | -41/+20 | |
| | | | ||||||
| * | | [web] Load dumped options at start up. | Matthew Shao | 2017-07-26 | 1 | -0/+6 | |
| | | | ||||||
| * | | [web] Update options auto dump for frontend. | Matthew Shao | 2017-07-26 | 3 | -26/+6 | |
| | | | ||||||
| * | | [web] Update POST /options/dump API in backend. | Matthew Shao | 2017-07-26 | 1 | -9/+3 | |
| | | | ||||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-24 | 3 | -2/+44 | |
| | | | ||||||
| * | | [web] Add Download/Load button to OptionEditor. | Matthew Shao | 2017-07-24 | 2 | -1/+28 | |
| | | | ||||||
| * | | [web] Add /options/dump API to backend. | Matthew Shao | 2017-07-24 | 1 | -1/+18 | |
| | | | ||||||
| * | | [web] Update OptManager.save() to suit the need of mitmweb. | Matthew Shao | 2017-07-24 | 1 | -5/+11 | |
| | | | ||||||
| * | | [web] OptionModal component coverge ++. | Matthew Shao | 2017-07-22 | 3 | -1/+116 | |
| | | | ||||||
| * | | [web] Update tests. | Matthew Shao | 2017-07-21 | 1 | -0/+33 | |
| | | | ||||||
| * | | [web] Add default value suggester in option editor. | Matthew Shao | 2017-07-21 | 1 | -0/+27 | |
| | | | ||||||
* | | | Merge pull request #2473 from mengbiping/postpone-connection | Maximilian Hils | 2017-07-26 | 1 | -10/+13 | |
|\ \ \ | | | | | | | | | Respect response to CONNECT created in http_connect function in upstream mode |