aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* --wip--Thomas Kriechbaumer2016-02-044-131/+296
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-021-2/+2
|\
| * move travis-slack notification to different channelThomas Kriechbaumer2016-02-021-2/+2
* | add appveyor slack integrationMaximilian Hils2016-02-021-1/+4
|/
* fix #861, fix #888Maximilian Hils2016-02-021-2/+14
* Merge pull request #909 from chrishamant/masterMaximilian Hils2016-02-021-0/+3
|\
| * fix crash with viewing unpacked date objectsChris Hamant2016-02-021-0/+3
|/
* turn script reloader off by default outside mitmdump/mitmproxyMaximilian Hils2016-02-023-4/+8
* tests: use relative importsMaximilian Hils2016-02-0219-21/+19
* raise an ScriptException when running unloaded scriptsMaximilian Hils2016-02-021-0/+2
* silence third-party modulesMaximilian Hils2016-02-021-0/+8
* Merge pull request #906 from anantk17/masterMaximilian Hils2016-02-011-1/+5
|\
| * added commentsAnant2016-01-311-0/+1
| * Added feature to intercept flows from within inline scriptsAnant2016-01-251-2/+5
* | fix #903Maximilian Hils2016-01-301-1/+1
* | code formatting: fix whitespace issuesThomas Kriechbaumer2016-01-2775-63/+249
* | cleanup importsThomas Kriechbaumer2016-01-2723-43/+20
* | Merge pull request #884 from dufferzafar/exportMaximilian Hils2016-01-263-34/+113
|\ \
| * | Remove restrictions based on request contentShadab Zafar2016-01-251-13/+0
| * | Copy as raw requestShadab Zafar2016-01-133-0/+14
| * | Export/Copy request as python codeShadab Zafar2016-01-133-1/+33
| * | Use signals.status_message for empty contentShadab Zafar2016-01-131-1/+2
| * | Refactor copy_as_curl_commandShadab Zafar2016-01-131-9/+7
| * | refactored export as curl to be 'E' to export and 'c' to as curl commandMarcelo Glezer2016-01-133-7/+27
| * | headers enumartion was failing in copy as curl and protocol was None when cop...Marcelo Glezer2016-01-131-2/+2
| * | fixed TypeError: ask_save_overwrite() takes exactly 2 arguments (xxxxx given)Marcelo Glezer2016-01-131-1/+1
| * | Was needlessly passing un-used parameters + clean up misspellingRyan Welton2016-01-131-17/+13
| * | Switch to single quotesRyan Welton2016-01-131-2/+2
| * | Add copy as curl commandRyan Welton2016-01-133-17/+48
* | | Merge pull request #893 from dweinstein/sni-ignoreMaximilian Hils2016-01-264-58/+98
|\ \ \
| * | | Add SNI ignore docs and have code match itDavid Weinstein2016-01-262-11/+11
| * | | Include raw client hello in exceptionDavid Weinstein2016-01-261-3/+3
| * | | remove TODODavid Weinstein2016-01-261-1/+1
| * | | Simplify check_ignore in _next_layerDavid Weinstein2016-01-261-13/+12
| * | | Log exceptions parsing TlsClientHello in TlsLayerDavid Weinstein2016-01-261-4/+7
| * | | remove client_tls property from TlsLayerDavid Weinstein2016-01-261-4/+0
| * | | Move SNI ignore check into _next_layerDavid Weinstein2016-01-261-28/+10
| * | | add TlsClientHello reprDavid Weinstein2016-01-261-0/+5
| * | | Don't store client_tls state in root contextDavid Weinstein2016-01-251-5/+4
| * | | Add ignore based on TLS ClientHello SNIDavid Weinstein2016-01-233-57/+113
| | |/ | |/|
* | | Merge pull request #898 from lilydjwg/masterMaximilian Hils2016-01-261-2/+2
|\ \ \ | |/ / |/| |
| * | [console] always show connection info in Details tab依云2016-01-261-2/+2
|/ /
* | Merge pull request #891 from ganguera/masterMaximilian Hils2016-01-223-7/+18
|\ \
| * | Added CLI argument to enable "follow flow list" modeGuillem Anguera2016-01-223-7/+18
|/ /
* | Merge pull request #879 from snemes/masterMaximilian Hils2016-01-184-6/+10
|\ \
| * \ Merge branch 'master' of https://github.com/snemes/mitmproxySandor Nemes2016-01-182-14/+20
| |\ \
| | * \ Merge branch 'master' into masterSandor Nemes2016-01-182-14/+20
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #881 from MatthewShao/Fix#846Maximilian Hils2016-01-182-14/+20
|\ \ \ \
| * | | | Update reloader.pyMatthew Shao2016-01-181-1/+0
| * | | | Update reloader.pyMatthew Shao2016-01-181-1/+1