aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* py3++Maximilian Hils2016-04-1311-33/+36
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-132-3/+3
|\
| * gulp-minify-css is deprecated. Adding gulp-clean-cssIsrael Blancas2016-04-112-3/+3
* | fix #1082Maximilian Hils2016-04-131-1/+1
* | minor improvementsMaximilian Hils2016-04-135-29/+13
|/
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-111-0/+11
|\
| * Add installation instructions for Arch Linux (#1079)Felix Yan2016-04-111-0/+11
* | peer_address -> ip_addressMaximilian Hils2016-04-119-23/+16
* | docs: better data structure docsMaximilian Hils2016-04-117-76/+66
|/
* docs: fix logoMaximilian Hils2016-04-102-0/+0
* update READMEMaximilian Hils2016-04-091-1/+1
* bump versionMaximilian Hils2016-04-092-1/+7
* update CHANGELOGMaximilian Hils2016-04-091-1/+26
* server replay: keep --kill activeMaximilian Hils2016-04-093-16/+6
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-091-1/+1
|\
| * Fix being unable to export binary data in requests (#1069)Anthony Zhang2016-04-091-1/+1
* | fix client playback logicMaximilian Hils2016-04-091-7/+8
|/
* fix server replay shutdownMaximilian Hils2016-04-091-11/+19
* add sphinx_rtd_theme as a dependencyMaximilian Hils2016-04-031-0/+1
* Merge branch 'better-replace'Maximilian Hils2016-04-0310-65/+100
|\
| * improve .replace() and move it into netlibMaximilian Hils2016-04-0210-65/+100
* | update dependenciesMaximilian Hils2016-04-031-6/+5
* | Merge pull request #1076 from mitmproxy/issue-1061Thomas Kriechbaumer2016-04-032-21/+19
|\ \
| * | fix #1061Maximilian Hils2016-04-022-21/+19
* | | Merge pull request #1074 from mitmproxy/move-response-refreshThomas Kriechbaumer2016-04-036-93/+107
|\ \ \
| * | | move HTTPResponse.refresh into netlibMaximilian Hils2016-04-026-93/+107
* | | | Merge pull request #1073 from mitmproxy/first-line-formatThomas Kriechbaumer2016-04-039-76/+37
|\ \ \ \
| * | | | form_(in|out) -> first_line_formatMaximilian Hils2016-04-029-76/+37
* | | | | Merge pull request #1072 from mitmproxy/remove-response-msgThomas Kriechbaumer2016-04-035-15/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | response.msg -> response.reasonMaximilian Hils2016-04-025-15/+4
|/ / / /
* / / / minor simplificationsMaximilian Hils2016-04-022-4/+1
|/ / /
* | | improve timing displayMaximilian Hils2016-04-022-58/+64
* | | fix FlowMaster.create_request, add testMaximilian Hils2016-04-022-0/+6
* | | fix #1052Maximilian Hils2016-04-021-1/+1
|/ /
* | fix #1067Maximilian Hils2016-04-021-1/+1
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-04-021-1/+2
|\ \ | |/ |/|
| * Merge pull request #1066 from fimad/masterMaximilian Hils2016-03-311-1/+2
| |\
| | * Fix XSS vulnerability in HTTP errorsWill Coster2016-03-311-1/+2
| |/
* / add Serializeable.copyMaximilian Hils2016-04-027-19/+34
|/
* travis: checkout full repo for buildsMaximilian Hils2016-03-311-0/+2
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-03-3129-90/+377
|\
| * Merge pull request #1050 from zlorb/masterMaximilian Hils2016-03-295-2/+281
| |\
| | * Merge remote-tracking branch 'mitmproxy/master'Zohar Lorberbaum2016-03-280-0/+0
| | |\ | | |/ | |/|
| * | add safeguardThomas Kriechbaumer2016-03-271-1/+2
| * | improve flow export testsThomas Kriechbaumer2016-03-271-2/+23
| * | s/nocover/no cover/gThomas Kriechbaumer2016-03-2712-33/+32
| * | increase test timeoutThomas Kriechbaumer2016-03-271-1/+1
| * | Merge pull request #1055 from MatthewShao/issue#963Thomas Kriechbaumer2016-03-2715-51/+38
| |\ \
| | * | minor fix about if-else statementMatthew Shao2016-03-271-3/+1
| | * | update commentsMatthew Shao2016-03-263-7/+7