aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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 #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-302-1/+20
|\
| * 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 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 namesMaximilian Hils2017-07-292-3/+16
| |/
* | Merge pull request #2481 from mhils/option-typehintsMaximilian Hils2017-07-305-3/+123
|\ \ | |/ |/|
| * 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