aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | add version check for Python 3.4-Maximilian Hils2016-10-241-0/+6
|/ /
* | Merge pull request #1649 from cortesi/killMaximilian Hils2016-10-223-3/+1
|\ \ | |/ |/|
| * Don't call error for flow killAldo Cortesi2016-10-223-3/+1
* | Merge pull request #1655 from mhils/fix-encodingMaximilian Hils2016-10-225-16/+40
|\ \
| * | various encoding fixes, fix #1650Maximilian Hils2016-10-225-25/+41
| * | Handle `bytes` in request parametersSlobodan Mišković2016-10-221-2/+10
| |/
* | Merge pull request #1653 from mhils/issue-1651Maximilian Hils2016-10-222-5/+8
|\ \ | |/ |/|
| * add README.rst validation to CIMaximilian Hils2016-10-221-2/+6
| * fix README syntaxMaximilian Hils2016-10-221-3/+2
|/
* Merge pull request #1648 from cortesi/consoleAldo Cortesi2016-10-221-1/+1
|\
| * console: give statusbar messages a default timeoutAldo Cortesi2016-10-221-1/+1
* | Merge pull request #1647 from babldev/fix-flowfilter-exampleAldo Cortesi2016-10-221-1/+1
|\ \
| * | The first argument should be the filter, then the flow.Brady Law2016-10-211-1/+1
|/ /
* / Adjust issue templateAldo Cortesi2016-10-221-12/+10
|/
* Merge pull request #1644 from cortesi/multidictAldo Cortesi2016-10-214-112/+6
|\
| * multidict: remove to_dictAldo Cortesi2016-10-212-28/+0
| * multidict: ditch ImmutableMultiDictAldo Cortesi2016-10-214-84/+6
* | Merge pull request #1642 from cortesi/doxAldo Cortesi2016-10-211-3/+3
|\|
| * docs: fix broken versionAldo Cortesi2016-10-211-3/+3
|/
* dev.sh: pin to v3.5 for nowAldo Cortesi2016-10-211-2/+2
* console: correct log event handling iAldo Cortesi2016-10-211-3/+4
* Merge pull request #1637 from cortesi/tatanetlibAldo Cortesi2016-10-20211-893/+907
|\
| * The final piece: netlib -> mitproxy.netAldo Cortesi2016-10-20150-282/+275
| * netlib.tutils -> mitmproxy.test.tutilsAldo Cortesi2016-10-2038-104/+104
| * Improve exception hierarchyAldo Cortesi2016-10-202-15/+16
| * netlib.exceptions.* -> mitmproxy.exceptionsAldo Cortesi2016-10-2034-172/+164
| * netlib.encoding -> netlib.http.encodingAldo Cortesi2016-10-203-2/+3
| * netlib.certutils -> mitmproxy.certsAldo Cortesi2016-10-209-86/+97
| * netlib.utils -> netlib.checkAldo Cortesi2016-10-209-21/+21
| * netlib.utils.[get,set]bit -> mitmproxy.utils.bitsAldo Cortesi2016-10-207-30/+29
| * netlib.utils.BiDi -> mitmproxy.types.bidi.BiDiAldo Cortesi2016-10-207-49/+53
| * netlib.debug -> mitmproxy.utils.debugAldo Cortesi2016-10-203-2/+2
| * mitmproxy.types.[basethread,multidict,serializable]Aldo Cortesi2016-10-2024-32/+32
| * netlib.strutils -> mitmproxy.utils.strutilsAldo Cortesi2016-10-2026-25/+33
| * netlib.human -> mitmproxy.utils.humanAldo Cortesi2016-10-2013-13/+15
| * Create mitmproxy.utils hierarchyAldo Cortesi2016-10-2016-67/+69
| * netlib.version -> mitmproxy.versionAldo Cortesi2016-10-2016-17/+18
|/
* Merge pull request #1635 from cortesi/refactor3Aldo Cortesi2016-10-1921-27/+27
|\
| * console: fix master invocation orderAldo Cortesi2016-10-192-2/+2
| * mitmproxy.protocol -> mitmproxy.proxy.protocolAldo Cortesi2016-10-1919-25/+25
|/
* Merge pull request #1634 from cortesi/pathocThomas Kriechbaumer2016-10-191-1/+4
|\
| * pathoc: handle error when selecting on read fileAldo Cortesi2016-10-191-1/+4
|/
* debug: add missing print output file paramaterAldo Cortesi2016-10-191-1/+1
* Merge pull request #1633 from cortesi/refactor2Aldo Cortesi2016-10-19104-427/+428
|\
| * Move all tools into mitmproxy.tools, move models/* to top levelAldo Cortesi2016-10-1995-378/+381
| * Remove flow module entirely, move contents to top levelAldo Cortesi2016-10-1923-53/+51
* | Merge pull request #1632 from cortesi/refactorAldo Cortesi2016-10-1975-247/+157
|\|
| * flow.state -> addons.stateAldo Cortesi2016-10-199-118/+26
| * addons.Addons -> addonmanager, builtins -> addonsAldo Cortesi2016-10-1965-79/+81
| * controller.Log -> log.LogAldo Cortesi2016-10-197-51/+51
|/