aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* minor fixesMaximilian Hils2016-07-014-8/+8
|
* fix tcp message handlingMaximilian Hils2016-07-018-22/+44
|
* py3++Maximilian Hils2016-07-019-48/+56
|
* Handle case when scheme is NoneShadab Zafar2016-07-011-1/+1
|
* py3++: test/mitmproxy/test_serverShadab Zafar2016-07-016-35/+39
|
* Merge pull request #1302 from mhils/update-dependenciesMaximilian Hils2016-06-292-9/+8
|\ | | | | Update Dependencies
| * update to latest `typing` releaseMaximilian Hils2016-06-292-4/+3
| |
| * bump depdenciesMaximilian Hils2016-06-291-6/+6
|/
* Merge pull request #1301 from mitmproxy/simplify-toxMaximilian Hils2016-06-2910-84/+64
|\ | | | | Simplify tox
| * appveyor: build snapshots on masterMaximilian Hils2016-06-291-1/+1
| |
| * 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
| | | | | | | | | | | | this makes ci very unreliable, see https://travis-ci.org/mitmproxy/mitmproxy/jobs/140994186 I don't know of a way to fix the test collection bug.
| * 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
| |
* | improve docs, fix #1290Maximilian Hils2016-06-291-2/+7
| |
* | Merge pull request #1296 from gzzhanghao/testMaximilian Hils2016-06-289-352/+557
|\ \ | |/ |/| [web] add tests for ducks/utils
| * [web] add tests for utilsJason2016-06-279-352/+557
| |
* | 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 tox
| * 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
|\ | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/app.jsx web/src/js/connection.js web/src/js/ducks/websocket.js
| * 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
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx