aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
|\
| * 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 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
|\ \
| * | 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 typoPaulo Romeira2017-07-291-3/+3
|/ /
* | Merge pull request #2476 from mhils/statusbar-testsMaximilian Hils2017-07-273-11/+46
|\ \
| * | add console statusbar testMaximilian Hils2017-07-273-11/+46
|/ /
* | Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2711-6/+217
|\ \
| * | [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
|\ \ \
| * | | add comment explaining upstream connect logicMaximilian Hils2017-07-261-0/+2
| * | | Allow http_connect to create a response for CONNECT request so that connectio...Biping Meng2017-07-261-10/+11
|/ / /
* | | Merge pull request #2469 from Kriechi/nuke-old-opensslMaximilian Hils2017-07-2515-244/+109
|\ \ \
| * | | nuke old opensslThomas Kriechbaumer2017-07-2514-228/+29
| * | | update cert with too small keyThomas Kriechbaumer2017-07-251-16/+80
| | |/ | |/|
* / | Squashed commit of the following:Maximilian Hils2017-07-256-7/+20
|/ /
* | Merge pull request #2467 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-07-241-1/+1
|\ \
| * | [requires.io] dependency updaterequires.io2017-07-241-1/+1
* | | Merge pull request #2466 from Kriechi/update-travisThomas Kriechbaumer2017-07-241-28/+6
|\ \ \ | |/ / |/| |
| * | update travisThomas Kriechbaumer2017-07-241-28/+6
* | | Merge pull request #2459 from mhils/fix-tbThomas Kriechbaumer2017-07-241-1/+1
|\ \ \ | |/ / |/| |
| * | fix addon tracebacksMaximilian Hils2017-07-211-1/+1
| |/
* | [requires.io] dependency update on master branch (#2435)Thomas Kriechbaumer2017-07-241-2/+2