aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* style fixesThomas Kriechbaumer2016-08-141-3/+3
* Merge pull request #1441 from mitmproxy/integrate_mitmproxy_contentviewsMaximilian Hils2016-08-133-619/+63980
|\
| * merge with masterClemens2016-08-0935-1657/+116
| |\
| * | added hints from mhilsClemens2016-08-093-636/+63959
| * | fix get contentview in mitmwebClemens2016-08-041-2/+4
| * | integrate simplified contentviewsClemens2016-08-033-84/+71
| * | replace get_content_view in dumper and flowviewClemens2016-08-012-43/+7
| * | moved getlines to contentviewsClemens2016-07-292-32/+33
| * | combine clientside and serverside contentviewsClemens2016-07-291-30/+49
| * | mitmproxy.contentviews addedClemens2016-07-281-3/+47
| * | add parameter to content requestsClemens2016-07-271-0/+1
| * | add contentviews to settingsClemens2016-07-271-1/+4
* | | fix #1430Thomas Kriechbaumer2016-08-132-13/+15
* | | clean up code, improve DummyReplyMaximilian Hils2016-08-097-12/+30
* | | finalize Reply semantics, fix testsMaximilian Hils2016-08-0913-42/+63
* | | make Reply.state readonlyMaximilian Hils2016-08-091-5/+19
* | | improve reply semanticsMaximilian Hils2016-08-081-57/+57
* | | fix reply concurrencyMaximilian Hils2016-08-041-2/+22
| |/ |/|
* | fix testsMaximilian Hils2016-08-042-3/+0
* | minor improvementsMaximilian Hils2016-08-042-1/+2
* | simplify contentview logicMaximilian Hils2016-08-043-83/+69
* | fix #1465, fix ssl_insecureMaximilian Hils2016-08-023-8/+16
* | Revert "Add missing ssl_insecure option"Maximilian Hils2016-08-021-1/+0
* | Add missing ssl_insecure optionShadab Zafar2016-08-021-0/+1
* | integer division for python 3 compatibilityManish Kumar2016-08-011-1/+1
* | Merge pull request #1453 from dufferzafar/limit-to-filterMaximilian Hils2016-07-317-28/+28
|\ \
| * | Rename "Limit" feature to "Filter View"Shadab Zafar2016-07-317-28/+28
* | | Merge pull request #1447 from mitmproxy/secure-by-defaultAldo Cortesi2016-08-0110-45/+40
|\ \ \
| * | | improve invalid certificate uxMaximilian Hils2016-07-277-25/+20
| * | | verify upstream certificates by default (#1111)Sachin Kelkar2016-07-274-21/+21
* | | | Merge pull request #1451 from YanchWare/masterMaximilian Hils2016-07-301-0/+2
|\ \ \ \
| * | | | Integrated encode/decoder for brotliAngelo Agatino Nicolosi2016-07-301-0/+2
| | |/ / | |/| |
* | | | Substitute tilde with user's home.Vincent Haupert2016-07-301-0/+1
* | | | Fix platform import on Linux using python3Vincent Haupert2016-07-301-1/+2
|/ / /
* | | Merge pull request #1436 from dufferzafar/jsbeautifierMaximilian Hils2016-07-289-1582/+13
|\ \ \
| * | | Use replace while decodingdufferzafar2016-07-281-2/+3
| * | | Use strutils.native before sending data to jsbeautifierdufferzafar2016-07-271-1/+1
| * | | Re-order imports etc.dufferzafar2016-07-271-17/+11
| * | | Remove jsbeautifier filesdufferzafar2016-07-278-1564/+0
| * | | Use jsbeautifier from pipdufferzafar2016-07-271-2/+2
| | |/ | |/|
* | | minor fixesMaximilian Hils2016-07-272-3/+4
| |/ |/|
* | Merge pull request #1446 from cortesi/stateAldo Cortesi2016-07-282-1/+18
|\ \
| * | console: add replace_view_state, fix statusbar issuesAldo Cortesi2016-07-282-1/+18
* | | Merge pull request #1442 from cortesi/scriptsAldo Cortesi2016-07-281-0/+1
|\| |
| * | mitmdump: send script .done when terminating after flow readAldo Cortesi2016-07-281-0/+1
* | | add favicon to mitmweb (#1440)Clemens Brunner2016-07-272-1/+2
| |/ |/|
* | fix #1432Maximilian Hils2016-07-251-2/+8
* | Merge pull request #1428 from dufferzafar/replayAldo Cortesi2016-07-262-22/+33
|\ \ | |/ |/|
| * Consolidate replay under RShadab Zafar2016-07-252-22/+33
* | Merge pull request #1427 from mhils/grideditorAldo Cortesi2016-07-269-728/+884
|\ \