aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make Travis behaveAldo Cortesi2016-06-011-1/+6
* Ditch IRC Travis notifications, try to fix Slack Travis notificationsAldo Cortesi2016-06-011-10/+1
* Remove downloads for nowAldo Cortesi2016-06-011-5/+1
* Un-break mitmproxy consoleAldo Cortesi2016-06-011-1/+1
* Merge pull request #1183 from mitmproxy/module-importsAldo Cortesi2016-06-0166-504/+618
|\
| * Fix test suiteAldo Cortesi2016-06-013-12/+14
| * Fix lint harderAldo Cortesi2016-06-011-9/+9
| * Merge branch 'module-imports' of github.com:mitmproxy/mitmproxy into module-i...Aldo Cortesi2016-06-012-18/+15
| |\
| | * fix importsMaximilian Hils2016-05-312-16/+13
| | * fix PIL importMaximilian Hils2016-05-311-2/+2
| * | Satisfy lintAldo Cortesi2016-06-015-6/+8
| |/
| * use module-level imports onlyMaximilian Hils2016-05-3166-488/+601
* | Merge pull request #1182 from cortesi/netlibimportsMaximilian Hils2016-05-3121-170/+172
|\ \
| * | Reorganise netlib imports according to Google Style GuideAldo Cortesi2016-06-0121-170/+172
* | | It's text markup language, Jim, but not as we know itAldo Cortesi2016-06-011-3/+3
|/ /
* | Merge remote-tracking branch 'upstream/master'Aldo Cortesi2016-06-018-28/+29
|\ \
| * \ Merge pull request #1180 from dufferzafar/pathod-baseMaximilian Hils2016-05-313-14/+16
| |\ \ | | |/ | |/|
| | * Py3: Use byte literals for comparisonShadab Zafar2016-05-311-12/+12
| | * Py3: Use six.string_types instead of basestringShadab Zafar2016-05-311-1/+2
| | * Py3: Use range from six.movesShadab Zafar2016-05-311-1/+2
| * | be more strict about module namespacesMaximilian Hils2016-05-315-14/+13
| |/
* | Merge branch 'master' of github.com:cortesi/mitmproxyAldo Cortesi2016-06-0145-614/+622
|\|
| * Merge pull request #1179 from cortesi/reorgAldo Cortesi2016-05-3145-604/+587
| |\
| | * Fix tests harderAldo Cortesi2016-05-311-2/+2
| | * http2.frame -> http2.framereaderAldo Cortesi2016-05-314-12/+12
| | * Fix test failuresAldo Cortesi2016-05-311-1/+1
| | * Satisfy flake8Aldo Cortesi2016-05-319-2/+9
| | * Unify and make symmetric pretty_size and parse_sizeAldo Cortesi2016-05-312-21/+24
| | * Move human-friendly format functions to netlib.human, remove redundant implem...Aldo Cortesi2016-05-3117-141/+110
| | * utils.multipartdecode -> http.multipart.decodeAldo Cortesi2016-05-319-95/+101
| | * netlib.utils.get_header_tokens -> netlib.http1.read.get_header_tokensAldo Cortesi2016-05-314-25/+25
| | * isascii is unusedAldo Cortesi2016-05-311-8/+0
| | * Module is part of the name - url.decode, not url.urldecodeAldo Cortesi2016-05-3111-42/+42
| | * Extract url functions from netlib.utils and move to netlib.http.urlAldo Cortesi2016-05-3112-182/+186
| | * Start cleaning up netlib.utilsAldo Cortesi2016-05-3117-155/+157
| |/
| * Merge pull request #1178 from cortesi/pseudohdrsAldo Cortesi2016-05-314-10/+35
| |\
| | * Extend pseudo-header treatment to :status on responsesAldo Cortesi2016-05-311-2/+6
| | * Improve handling of pseudo-headersAldo Cortesi2016-05-314-8/+29
| |/
* / Style guides in READMEAldo Cortesi2016-06-011-0/+9
|/
* Make tox run all tests for 2.7Aldo Cortesi2016-05-311-0/+5
* Fix test import errorAldo Cortesi2016-05-311-1/+2
* Merge branch 'flow-module-2' of https://github.com/mhils/mitmproxy into mhils...Aldo Cortesi2016-05-3110-1282/+1295
|\
| * tell flake8 that type-annotation imports are okayMaximilian Hils2016-05-302-3/+3
| * split mitmproxy.flow into mitmproxy.flow.*Maximilian Hils2016-05-3010-1282/+1295
* | activate flake8 for good!Thomas Kriechbaumer2016-05-302-2/+2
|/
* start of developing server side for options (#1155)Clemens Brunner2016-05-298-210/+599
* Satisfy flake8Aldo Cortesi2016-05-303-7/+7
* Merge branch 'tox' of https://github.com/Kriechi/mitmproxy into Kriechi-toxAldo Cortesi2016-05-303-0/+13
|\
| * add toxThomas Kriechbaumer2016-05-293-0/+13
* | fixThomas Kriechbaumer2016-05-291-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 07:44:11 +0000