aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove superfluous statements in tox.iniMaximilian Hils2016-06-291-3/+0
* collect coverage on appveyorMaximilian Hils2016-06-281-1/+3
* minor fixesMaximilian Hils2016-06-284-3/+2
* do not run tests in parallelMaximilian Hils2016-06-281-1/+1
* watchdog: always use PollingObserverMaximilian Hils2016-06-281-6/+4
* compile docs on python 3.5Maximilian Hils2016-06-283-3/+3
* powershell magicMaximilian Hils2016-06-281-1/+1
* resilence Cryptography_locking_cbMaximilian Hils2016-06-281-1/+1
* fix appveyorMaximilian Hils2016-06-284-26/+26
* simplify tox setupMaximilian Hils2016-06-284-45/+29
* fix mysterious tox issueMaximilian Hils2016-06-282-2/+2
* fix path in appveyorThomas Kriechbaumer2016-06-281-1/+1
* update tox env on CIThomas Kriechbaumer2016-06-281-1/+1
* fix appveyor snapshot uploadThomas Kriechbaumer2016-06-281-0/+2
* Merge pull request #1294 from mitmproxy/appveyor-py3Maximilian Hils2016-06-285-24/+51
|\
| * update appveyor with toxThomas Kriechbaumer2016-06-275-24/+51
|/
* fix lxml installation on py27Maximilian Hils2016-06-261-1/+3
* rtool: build py3 wheels an binariesMaximilian Hils2016-06-261-2/+5
* minor docs fixMaximilian Hils2016-06-261-1/+1
* fix mitmproxy/mitmweb#25Maximilian Hils2016-06-264-22/+17
* [web] (mostly) remove jQueryMaximilian Hils2016-06-265-38/+16
* minor fixesMaximilian Hils2016-06-2616-233/+200
* [web] sorter -> sortMaximilian Hils2016-06-253-42/+42
* [web] log only in devJason2016-06-252-5/+11
* [web] build with envifyJason2016-06-253-685/+346
* [web] update buildJason2016-06-251-4/+4
* [web] fix importsJason2016-06-252-0/+2
* [web] fix update filterJason2016-06-251-1/+1
* [web] ErrorViewJason2016-06-253-3/+20
* [web] fix actionsJason2016-06-2514-102/+146
* [web] fix selectFlowsJason2016-06-254-7/+9
* [web] add msgQueueJason2016-06-259-233/+278
* Merge branch 'master' of github.com:mitmproxy/mitmproxy into listJason2016-06-2413-128/+239
|\
| * Merge remote-tracking branch 'jason/websocket'Maximilian Hils2016-06-236-102/+184
| |\
| | * [web] set connected to false when DISCONNECTEDJason2016-06-223-159/+153
| | * [web] store ws object in symbol propertyJason2016-06-222-31/+10
| | * Merge remote-tracking branch 'origin/master' into websocketJason2016-06-2228-161/+260
| | |\
| | * \ Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocketJason2016-06-1812-227/+206
| | |\ \
| | * | | [web] add app ducksJason2016-06-184-46/+81
| | * | | Merge branch 'master' into websocketJason2016-06-1763-2103/+2127
| | |\ \ \
| | * | | | [web] websocketJason2016-06-177-61934/+775
| * | | | | Merge pull request #1285 from westurner/patch-1Maximilian Hils2016-06-231-2/+18
| |\ \ \ \ \
| | * | | | | DOC: install.rst: Installation on Fedora, UbuntuWes Turner2016-06-211-2/+18
| * | | | | | http2: improve error handling in testsThomas Kriechbaumer2016-06-222-13/+31
| * | | | | | Merge pull request #1291 from BSalita/masterMaximilian Hils2016-06-221-1/+3
| |\ \ \ \ \ \
| | * | | | | | Show how to upgrade pip.BSalita2016-06-221-1/+3
| * | | | | | | Merge pull request #1282 from dufferzafar/py3Maximilian Hils2016-06-224-6/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | py3++: mitmproxy.platform.pfShadab Zafar2016-06-222-1/+2
| | * | | | | | py3++: mitmproxy.protocol.http1Shadab Zafar2016-06-222-5/+5
| | * | | | | | py3++: mitmproxy.proxyShadab Zafar2016-06-222-2/+2
| |/ / / / / /