aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into solidcoreAldo Cortesi2016-05-2957-117/+124
|\
| * 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
* | Be stricter about the handler call signatureAldo Cortesi2016-05-282-2/+7
* | Merge branch 'master' into solidcoreAldo Cortesi2016-05-281-1/+3
|\|
| * Fix crash in mitmproxy when viewing responsesAldo 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
| |/ |/|
* | 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
| * | | Remove inner_repr, fixup escape_unprintablesShadab Zafar2016-05-262-26/+8
| * | | Use escaped_str functions for TokValueLiteralShadab Zafar2016-05-261-6/+7
| * | | Remove Py3 specific checkShadab Zafar2016-05-261-2/+1
| * | | Use BytesIO in pathod appShadab Zafar2016-05-261-2/+2
| * | | Py3: Handle bytes case in inner_reprShadab Zafar2016-05-262-1/+3
| * | | Removed wrong importShadab Zafar2016-05-261-0/+1
| * | | Py3: inner_repr and escape_unprintablesShadab Zafar2016-05-261-2/+7
| * | | Py3: Import and Other misc. stuffShadab Zafar2016-05-265-13/+13
|/ / /
* | | fix py3 testsMaximilian Hils2016-05-251-1/+1
* | | bytes_to_escaped_str: always escape single quotesMaximilian Hils2016-05-253-2/+10
* | | escaped_str_to_bytes: support unicode on python 2Maximilian Hils2016-05-252-4/+11
| |/ |/|
* | Refactor dev.shAldo Cortesi2016-05-263-24/+10
* | Merge pull request #1168 from Kriechi/venv-py3Aldo Cortesi2016-05-262-7/+24
|\ \
| * | add a py3 venv in dev environmentThomas Kriechbaumer2016-05-252-7/+24
* | | Update issue_template.mdMaximilian Hils2016-05-241-0/+1
|/ /
* | Merge pull request #1127 from mitmproxy/tcp-flowsThomas Kriechbaumer2016-05-2313-68/+180
|\ \
| * | tests++Maximilian Hils2016-05-202-2/+32
| * | add FlowMaster.active_flowsMaximilian Hils2016-05-193-16/+13
| * | tests: finish connections properlyMaximilian Hils2016-05-191-0/+1
| * | fix tests, don't double-add error'd flowsMaximilian Hils2016-05-192-3/+3
| * | minor fixes, adjust testsMaximilian Hils2016-05-195-13/+13
| * | mimtdump: add basic support for tcp flowsMaximilian Hils2016-05-197-55/+139
* | | minor fixes (#1165)Maximilian Hils2016-05-233-7/+2
| | * [web] add default value for text viewsJason2016-05-281-2/+2
| | * [web] eliminate RawMixinJason2016-05-281-17/+47
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 04:33:41 +0000