Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | watchdog: always use PollingObserver | Maximilian Hils | 2016-06-28 | 1 | -6/+4 | |
| * | compile docs on python 3.5 | Maximilian Hils | 2016-06-28 | 3 | -3/+3 | |
| * | powershell magic | Maximilian Hils | 2016-06-28 | 1 | -1/+1 | |
| * | resilence Cryptography_locking_cb | Maximilian Hils | 2016-06-28 | 1 | -1/+1 | |
| * | fix appveyor | Maximilian Hils | 2016-06-28 | 4 | -26/+26 | |
| * | simplify tox setup | Maximilian Hils | 2016-06-28 | 4 | -45/+29 | |
* | | improve docs, fix #1290 | Maximilian Hils | 2016-06-29 | 1 | -2/+7 | |
* | | Merge pull request #1296 from gzzhanghao/test | Maximilian Hils | 2016-06-28 | 9 | -352/+557 | |
|\ \ | |/ |/| | ||||||
| * | [web] add tests for utils | Jason | 2016-06-27 | 9 | -352/+557 | |
* | | fix mysterious tox issue | Maximilian Hils | 2016-06-28 | 2 | -2/+2 | |
* | | fix path in appveyor | Thomas Kriechbaumer | 2016-06-28 | 1 | -1/+1 | |
* | | update tox env on CI | Thomas Kriechbaumer | 2016-06-28 | 1 | -1/+1 | |
* | | fix appveyor snapshot upload | Thomas Kriechbaumer | 2016-06-28 | 1 | -0/+2 | |
* | | Merge pull request #1294 from mitmproxy/appveyor-py3 | Maximilian Hils | 2016-06-28 | 5 | -24/+51 | |
|\ \ | |/ |/| | ||||||
| * | update appveyor with tox | Thomas Kriechbaumer | 2016-06-27 | 5 | -24/+51 | |
|/ | ||||||
* | fix lxml installation on py27 | Maximilian Hils | 2016-06-26 | 1 | -1/+3 | |
* | rtool: build py3 wheels an binaries | Maximilian Hils | 2016-06-26 | 1 | -2/+5 | |
* | minor docs fix | Maximilian Hils | 2016-06-26 | 1 | -1/+1 | |
* | fix mitmproxy/mitmweb#25 | Maximilian Hils | 2016-06-26 | 4 | -22/+17 | |
* | [web] (mostly) remove jQuery | Maximilian Hils | 2016-06-26 | 5 | -38/+16 | |
* | minor fixes | Maximilian Hils | 2016-06-26 | 16 | -233/+200 | |
* | [web] sorter -> sort | Maximilian Hils | 2016-06-25 | 3 | -42/+42 | |
* | [web] log only in dev | Jason | 2016-06-25 | 2 | -5/+11 | |
* | [web] build with envify | Jason | 2016-06-25 | 3 | -685/+346 | |
* | [web] update build | Jason | 2016-06-25 | 1 | -4/+4 | |
* | [web] fix imports | Jason | 2016-06-25 | 2 | -0/+2 | |
* | [web] fix update filter | Jason | 2016-06-25 | 1 | -1/+1 | |
* | [web] ErrorView | Jason | 2016-06-25 | 3 | -3/+20 | |
* | [web] fix actions | Jason | 2016-06-25 | 14 | -102/+146 | |
* | [web] fix selectFlows | Jason | 2016-06-25 | 4 | -7/+9 | |
* | [web] add msgQueue | Jason | 2016-06-25 | 9 | -233/+278 | |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy into list | Jason | 2016-06-24 | 13 | -128/+239 | |
|\ | ||||||
| * | Merge remote-tracking branch 'jason/websocket' | Maximilian Hils | 2016-06-23 | 6 | -102/+184 | |
| |\ | ||||||
| | * | [web] set connected to false when DISCONNECTED | Jason | 2016-06-22 | 3 | -159/+153 | |
| | * | [web] store ws object in symbol property | Jason | 2016-06-22 | 2 | -31/+10 | |
| | * | Merge remote-tracking branch 'origin/master' into websocket | Jason | 2016-06-22 | 28 | -161/+260 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket | Jason | 2016-06-18 | 12 | -227/+206 | |
| | |\ \ | ||||||
| | * | | | [web] add app ducks | Jason | 2016-06-18 | 4 | -46/+81 | |
| | * | | | Merge branch 'master' into websocket | Jason | 2016-06-17 | 63 | -2103/+2127 | |
| | |\ \ \ | ||||||
| | * | | | | [web] websocket | Jason | 2016-06-17 | 7 | -61934/+775 | |
| * | | | | | Merge pull request #1285 from westurner/patch-1 | Maximilian Hils | 2016-06-23 | 1 | -2/+18 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | DOC: install.rst: Installation on Fedora, Ubuntu | Wes Turner | 2016-06-21 | 1 | -2/+18 | |
| * | | | | | | http2: improve error handling in tests | Thomas Kriechbaumer | 2016-06-22 | 2 | -13/+31 | |
| * | | | | | | Merge pull request #1291 from BSalita/master | Maximilian Hils | 2016-06-22 | 1 | -1/+3 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Show how to upgrade pip. | BSalita | 2016-06-22 | 1 | -1/+3 | |
| * | | | | | | | Merge pull request #1282 from dufferzafar/py3 | Maximilian Hils | 2016-06-22 | 4 | -6/+7 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||||
| | * | | | | | | py3++: mitmproxy.platform.pf | Shadab Zafar | 2016-06-22 | 2 | -1/+2 | |
| | * | | | | | | py3++: mitmproxy.protocol.http1 | Shadab Zafar | 2016-06-22 | 2 | -5/+5 | |
| | * | | | | | | py3++: mitmproxy.proxy | Shadab Zafar | 2016-06-22 | 2 | -2/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | [web] bug fix | Jason | 2016-06-24 | 4 | -13/+17 |