aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* [web] Add static.js to index.html, containing MITMWEB_STATIC var.Matthew Shao2017-08-071-0/+1
* Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-301-1/+12
|\
| * make option redeclaration silent if signature is the sameMaximilian Hils2017-07-301-1/+12
* | Merge pull request #2482 from mhils/pure-script-loadMaximilian Hils2017-07-301-17/+15
|\ \ | |/ |/|
| * make load_script pureMaximilian Hils2017-07-301-17/+15
* | Merge pull request #2483 from mhils/ignore-imports-with-hook-namesMaximilian Hils2017-07-301-3/+11
|\ \
| * | gracefully ignore imports with hook namesMaximilian Hils2017-07-291-3/+11
| |/
* | fix type hints for mitmproxy.ctxMaximilian Hils2017-07-291-3/+3
* | add option type hintsMaximilian Hils2017-07-291-0/+79
* | add OptManager.itemsMaximilian Hils2017-07-291-0/+3
|/
* Merge pull request #2452 from mattweidner/add_intercept_toggleMaximilian Hils2017-07-296-1/+19
|\
| * 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-295-6/+20
|\ \
| * | Fix lint error.Matthew Shao2017-07-281-1/+1
| * | Improve verbosity options.Matthew Shao2017-07-285-6/+20
| |/
* | Merge pull request #2471 from ujjwal96/traceback-fixMaximilian Hils2017-07-291-1/+1
|\ \ | |/ |/|
| * fixed addon errorUjjwal Verma2017-07-261-1/+1
* | Merge pull request #2460 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-272-2/+11
|\ \
| * | [web] Minor Fix for backend.Matthew Shao2017-07-272-13/+4
| * | [web] Fix conflict.Matthew Shao2017-07-262-12/+8
| * | [web] Load dumped options at start up.Matthew Shao2017-07-261-0/+6
| * | [web] Update POST /options/dump API in backend.Matthew Shao2017-07-261-9/+3
| * | [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
* | | 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-255-91/+19
|\ \ \
| * | | nuke old opensslThomas Kriechbaumer2017-07-255-91/+19
| | |/ | |/|
* / | Squashed commit of the following:Maximilian Hils2017-07-252-6/+13
|/ /
* / fix addon tracebacksMaximilian Hils2017-07-211-1/+1
|/
* Merge pull request #2430 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-201-1/+1
|\
| * [web] Update error msg in PUT /options API.Matthew Shao2017-07-171-1/+1
* | Merge pull request #2454 from mhils/minor-improvementsMaximilian Hils2017-07-205-62/+72
|\ \
| * | update mypyMaximilian Hils2017-07-203-13/+13
| * | fix type declarationMaximilian Hils2017-07-201-1/+1
| * | shorten option helpMaximilian Hils2017-07-203-18/+17
| * | make eventsequence.iterate extendableMaximilian Hils2017-07-151-39/+55
| * | remove `--shortversion`Maximilian Hils2017-07-151-6/+1
| |/
* | replace deprecated use of SourceFileLoader.load_moduleMaximilian Hils2017-07-201-2/+4
* | fix loading scripts with same filenameMaximilian Hils2017-07-201-3/+10
* | Allow remote addonUjjwal Verma2017-07-152-0/+31
|/
* Merge pull request #2427 from ujjwal96/protobufThomas Kriechbaumer2017-07-104-22/+280
|\
| * Kaitai parser for protobufUjjwal Verma2017-07-104-22/+280
* | Merge pull request #2423 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-052-7/+17
|\ \
| * | [web] Broadcast options update in backend.Matthew Shao2017-07-051-0/+10
| * | [web] Add keys argument for dump_dict in optmanager.Matthew Shao2017-07-051-2/+3
| * | [web] Change the response format of GET /options.Matthew Shao2017-07-021-5/+4