aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* raise a more verbose errorThomas Kriechbaumer2016-05-291-3/+3
* more style cleanupThomas Kriechbaumer2016-05-293-14/+24
* fix #1162Thomas Kriechbaumer2016-05-291-2/+5
* more style cleanupThomas Kriechbaumer2016-05-2964-99/+139
* fix travis with flake8Thomas Kriechbaumer2016-05-291-1/+1
* install flake8Thomas Kriechbaumer2016-05-291-4/+5
* more style cleanupThomas Kriechbaumer2016-05-2917-72/+76
* change comment indentationThomas Kriechbaumer2016-05-291-3/+3
* Merge pull request #1173 from mitmproxy/format-examplesThomas Kriechbaumer2016-05-2911-23/+28
|\
| * format examplesMaximilian Hils2016-05-2911-23/+28
* | Merge pull request #1174 from Kriechi/flake8Thomas Kriechbaumer2016-05-291-0/+1
|\ \
| * | make sure we do not introduce more style offensesThomas Kriechbaumer2016-05-291-0/+1
* | | fix docs typoMaximilian Hils2016-05-294-520/+0
* | | Update method names in /examples/flowbasicAldo Cortesi2016-05-291-2/+2
* | | controller.ControlError -> exceptions.ControlExceptionAldo Cortesi2016-05-292-12/+11
| |/ |/|
* | Add some comments to controller wrapper.Aldo Cortesi2016-05-291-0/+5
* | Merge pull request #1172 from cortesi/solidcoreAldo Cortesi2016-05-2916-234/+301
|\ \
| * | Adapt examplesAldo Cortesi2016-05-293-18/+17
| * | handle_* -> *Aldo Cortesi2016-05-2912-108/+104
| * | Explicitly list all eventsAldo Cortesi2016-05-292-2/+25
| * | Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcoreAldo Cortesi2016-05-290-0/+0
| |\ \
| | * \ Merge branch 'master' into solidcoreAldo Cortesi2016-05-282-5/+5
| | |\ \
| * | | | Flatten ServerMaster into MasterAldo Cortesi2016-05-293-38/+11
| * | | | Merge branch 'master' into solidcoreAldo Cortesi2016-05-2957-117/+124
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| * | | Be stricter about the handler call signatureAldo Cortesi2016-05-282-2/+7
| * | | Merge branch 'master' into solidcoreAldo Cortesi2016-05-281-1/+3
| |\ \ \
| * | | | Zap stray debugging callAldo Cortesi2016-05-281-1/+0
| * | | | Merge branch 'solidcore' of github.com:cortesi/mitmproxy into solidcoreAldo Cortesi2016-05-280-0/+0
| |\ \ \ \
| | * | | | Mandate that all handlers must be wrapped, make tests passAldo Cortesi2016-05-265-34/+44
| | * | | | Sketch out a more solid coreAldo Cortesi2016-05-267-35/+79
| * | | | | Make @controller.handler inheritance-friendlyAldo Cortesi2016-05-286-18/+36
| * | | | | Mandate that all handlers must be wrapped, make tests passAldo Cortesi2016-05-285-34/+44
| * | | | | Sketch out a more solid coreAldo Cortesi2016-05-287-35/+79
* | | | | | fix testsMaximilian Hils2016-05-287-8/+8
* | | | | | minor improvementsMaximilian Hils2016-05-281-4/+4
| |_|_|/ / |/| | | |
* | | | | mitmproxy: fix most flake8 offensesThomas Kriechbaumer2016-05-2812-19/+36
* | | | | pathod: fix most flake8 offensesThomas Kriechbaumer2016-05-286-13/+11
* | | | | netlib: fix most flake8 offensesThomas Kriechbaumer2016-05-2810-31/+43
* | | | | ignore sslkeylogfile.logThomas Kriechbaumer2016-05-281-0/+1
* | | | | cleanup imports with flake8Thomas Kriechbaumer2016-05-2833-50/+29
| |_|_|/ |/| | |
* | | | fix Python 2 testsMaximilian Hils2016-05-281-2/+2
* | | | Enable Travis for test_logShadab Zafar2016-05-281-2/+2
* | | | Py3: Use cStringIO from six.movesShadab Zafar2016-05-281-3/+3
| |_|/ |/| |
* | | Fix crash in mitmproxy when viewing responsesAldo Cortesi2016-05-281-1/+3
|/ /
* | Merge pull request #1169 from gzzhanghao/contentviewMaximilian Hils2016-05-277-88/+112
|\ \
| * \ Merge remote-tracking branch 'origin/master' into contentviewJason2016-05-2832-135/+253
| |\ \ | |/ / |/| |
* | | Merge pull request #1119 from dufferzafar/pathod-portMaximilian Hils2016-05-269-43/+35
|\ \ \
| * | | Enable travis Py3 testing for test_utilsShadab Zafar2016-05-261-2/+2
| * | | Go Python 3 by default with the bytes conversionShadab Zafar2016-05-261-2/+4
| * | | remove str()Shadab Zafar2016-05-261-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 13:28:00 +0000