aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | 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
| |/ / / / / /
* | | | | | | [web] bug fixJason2016-06-244-13/+17
* | | | | | | [web] fix bugsJason2016-06-247-58/+81
* | | | | | | [web] fix eventLog flowJason2016-06-241-1/+1
* | | | | | | [web] reduce eventlog viewJason2016-06-241-1/+4
* | | | | | | [web] code formatJason2016-06-241-2/+6
* | | | | | | [web] fix view data structureJason2016-06-241-2/+2
* | | | | | | [web] fix flows data flowJason2016-06-246-14/+15
* | | | | | | [web] ws methodsJason2016-06-232-21/+43
* | | | | | | [web] check item existence before updateJason2016-06-232-2/+8
* | | | | | | [web] fix eventLog ducksJason2016-06-236-71/+100
* | | | | | | [web] separate views and listJason2016-06-236-173/+413
* | | | | | | [web] update buildJason2016-06-232-194/+197
* | | | | | | [web] fix data connectionJason2016-06-237-13/+12
* | | | | | | [web] fix utils/listJason2016-06-233-27/+30
* | | | | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy into listJason2016-06-234-164/+158
|\| | | | | |
| * | | | | | Merge pull request #1286 from gzzhanghao/settingsMaximilian Hils2016-06-214-164/+158
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | [web] updateSettings -> handleWsMsgJason2016-06-224-164/+158
| |/ / / / /
* | | | | | [web] connect new ducks actionsJason2016-06-2310-28/+31
* | | | | | [web] fix ducks/flowsJason2016-06-232-9/+18
* | | | | | [web] remove ducks/utils/viewJason2016-06-231-134/+0
* | | | | | [web] flows.makeFunJason2016-06-231-14/+21
* | | | | | [web] FlowActions -> flows ducksJason2016-06-232-55/+83
* | | | | | [web] refactoring ducks/flowsJason2016-06-233-80/+109
* | | | | | [web] finish utils/listJason2016-06-233-153/+153
* | | | | | [web] use a dummy action to init listJason2016-06-221-1/+1
* | | | | | [web] update eventlogJason2016-06-221-53/+103
|/ / / / /
* | | | | Merge pull request #1283 from dufferzafar/tnetstring3Thomas Kriechbaumer2016-06-215-155/+273
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | py3++Shadab Zafar2016-06-211-1/+1
| * | | | mitmproxy.tnetstring -> mitmproxy.contrib.tnetstringShadab Zafar2016-06-214-3/+4
| * | | | Imported tests for tnetstringShadab Zafar2016-06-211-0/+141
| * | | | Py3: tnetstringShadab Zafar2016-06-211-152/+128
|/ / / /
* | | | Minor wording improvements for the READMEAldo Cortesi2016-06-211-3/+3
* | | | Merge pull request #1274 from Kriechi/discourse-readmeAldo Cortesi2016-06-211-2/+15
|\ \ \ \
| * | | | add Discourse to READMEThomas Kriechbaumer2016-06-211-2/+15
|/ / / /
* | | | add better descriptionMaximilian Hils2016-06-202-7/+8
* | | | added tests for uiClemens2016-06-204-6/+41
* | | | Merge pull request #1276 from dufferzafar/console-patheditMaximilian Hils2016-06-202-0/+26
|\ \ \ \
| * | | | Add dummy directory to completionShadab Zafar2016-06-201-0/+2
| * | | | Add tests for PathEditShadab Zafar2016-06-201-0/+24