aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename logging .py to prevent import errorsThomas Kriechbaumer2016-10-291-0/+0
* Merge pull request #1683 from cortesi/viewAldo Cortesi2016-10-293-0/+545
|\
| * addons.view: focus.focusflow -> focus.flowAldo Cortesi2016-10-292-50/+50
| * addons.view.focus: next and prev methodsAldo Cortesi2016-10-292-3/+42
| * addons.view: flow settingsAldo Cortesi2016-10-292-1/+51
| * addons.view.focus: Better handling of view refreshAldo Cortesi2016-10-292-4/+6
| * addons.View: better order reversalAldo Cortesi2016-10-292-16/+55
| * addons.view: Add a focus trackerAldo Cortesi2016-10-292-2/+123
| * addons.View: hook up signalsAldo Cortesi2016-10-292-4/+81
| * Sketch out addons.ViewAldo Cortesi2016-10-293-0/+217
|/
* Merge pull request #1687 from Kriechi/http2-type-informationAldo Cortesi2016-10-293-28/+29
|\
| * http2: add more type informationThomas Kriechbaumer2016-10-273-28/+29
* | Merge pull request #1686 from Kriechi/http2-push-indicatorAldo Cortesi2016-10-297-100/+120
|\ \ | |/ |/|
| * http2: add push indicatorThomas Kriechbaumer2016-10-277-100/+120
|/
* Merge pull request #1685 from mhils/travisMaximilian Hils2016-10-271-0/+2
|\
| * fix travisMaximilian Hils2016-10-271-0/+2
* | Merge pull request #1684 from mhils/1675Maximilian Hils2016-10-271-1/+5
|\ \
| * | fix #1675Maximilian Hils2016-10-271-1/+5
* | | Merge pull request #1671 from mitmproxy/bump-h2Maximilian Hils2016-10-273-18/+26
|\ \ \
| * | | upgrade h2 to >=2.5.0Thomas Kriechbaumer2016-10-273-18/+26
| * | | bump h2 versionMaximilian Hils2016-10-271-1/+1
* | | | Merge pull request #1681 from mhils/issue-1676Maximilian Hils2016-10-271-1/+1
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | fix #1676Maximilian Hils2016-10-271-1/+1
|/ /
* / fix #1678Maximilian Hils2016-10-271-3/+4
|/
* Merge pull request #1680 from mhils/remove-lrucacheMaximilian Hils2016-10-271-32/+0
|\
| * remove mitmproxy.utils.lrucacheMaximilian Hils2016-10-271-32/+0
* | fix pyinstaller buildsMaximilian Hils2016-10-273-3/+3
* | Merge pull request #1670 from chhsiao90/display-cipher-#582Maximilian Hils2016-10-274-1/+19
|\ \ | |/ |/|
| * Show tls version on consolechhsiao902016-10-264-0/+9
| * Resolved #582: display ClientConnection select cipher of TLSchhsiao902016-10-264-1/+10
* | Merge pull request #1677 from cortesi/mypyAldo Cortesi2016-10-272-4/+5
|\ \
| * | Add mypy to lintAldo Cortesi2016-10-272-4/+5
|/ /
* | Merge pull request #1673 from mhils/issue-1620Aldo Cortesi2016-10-274-9/+14
|\ \
| * | fix the linter, knuth ftw!Maximilian Hils2016-10-251-1/+1
| * | fix #1620Maximilian Hils2016-10-253-8/+13
* | | fix pyinstaller buildsMaximilian Hils2016-10-262-2/+2
* | | Update and rename README.mkd to README.mdMaximilian Hils2016-10-252-20/+8
* | | minor fixesMaximilian Hils2016-10-252-4/+4
|/ /
* | Merge pull request #1669 from mhils/typecheck-optionsMaximilian Hils2016-10-2516-20/+138
|\ \ | |/ |/|
| * typecheck options, fix current inconsistenciesMaximilian Hils2016-10-2516-21/+135
| * make options keyword-onlyMaximilian Hils2016-10-254-0/+4
|/
* Merge pull request #1664 from chhsiao90/sni-display-#1639Maximilian Hils2016-10-244-1/+10
|\
| * Resolved #1639: display sni on ClientConnectionchhsiao902016-10-254-1/+10
* | Merge pull request #1656 from mhils/improve-export-2Maximilian Hils2016-10-247-162/+87
|\ \
| * | improve flow exportMaximilian Hils2016-10-227-162/+87
* | | Merge pull request #1661 from slobo/patch-1Maximilian Hils2016-10-241-1/+1
|\ \ \ | |_|/ |/| |
| * | Include `boudary=...` in mutipart postData Slobodan Mišković2016-10-241-1/+1
* | | fix FlowView._get_content_viewMaximilian Hils2016-10-241-2/+6
* | | replace mitmproxy.utils.lrucache with functools.lru_cacheSahil Chelaramani2016-10-243-49/+6
* | | disable erroneous linting errorsMaximilian Hils2016-10-241-8/+9