aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
* | Merge pull request #1273 from Kriechi/fix-default-argMaximilian Hils2016-06-201-1/+4
|\ \
| * | fix default argThomas Kriechbaumer2016-06-191-1/+4
* | | Merge pull request #1278 from mitmproxy/add_accept_revert_buttons_to_menu_flowMaximilian Hils2016-06-202-6/+10
|\ \ \
| * | | added accept and revert to flowmenuClemens2016-06-202-6/+10
* | | | py3++Shadab Zafar2016-06-203-13/+14
* | | | py3++Shadab Zafar2016-06-204-36/+36
|/ / /
* | | Merge remote-tracking branch 'jason/settings'Maximilian Hils2016-06-198-89/+79
|\ \ \ | |_|/ |/| |
| * | [web] replace SetttingsActions.update with settings.updateSettingsJason2016-06-198-89/+79
* | | Merge pull request #1275 from Kriechi/more-py3Thomas Kriechbaumer2016-06-195-17/+19
|\ \ \ | |_|/ |/| |
| * | py3++Thomas Kriechbaumer2016-06-195-17/+19
|/ /
* | Merge pull request #1272 from dwfreed/patch-1Maximilian Hils2016-06-181-2/+2
|\ \ | |/ |/|
| * mitmproxy/models: missed comma in __all__Doug Freed2016-06-181-2/+2
|/
* Merge pull request #1270 from mitmproxy/settingsMaximilian Hils2016-06-1712-193/+168
|\
| * add setInterceptPattern action creatorMaximilian Hils2016-06-172-3/+13
| * add fetchApi.put shortcutMaximilian Hils2016-06-171-3/+15
| * simplify settings reducerMaximilian Hils2016-06-175-59/+58
| * [web] simplify settingsJason2016-06-172-38/+10
| * Merge branch 'master' into settingsJason2016-06-1763-2109/+2133
| |\ | |/ |/|
* | Merge pull request #1269 from Kriechi/pathod-netlib-http2Thomas Kriechbaumer2016-06-1719-519/+533
|\ \