aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* [web] ErrorViewJason2016-06-252-1/+18
* [web] fix actionsJason2016-06-2513-83/+127
* [web] fix selectFlowsJason2016-06-254-7/+9
* [web] add msgQueueJason2016-06-258-191/+233
* Merge branch 'master' of github.com:mitmproxy/mitmproxy into listJason2016-06-245-95/+169
|\
| * Merge remote-tracking branch 'jason/websocket'Maximilian Hils2016-06-235-95/+168
| |\
| | * [web] set connected to false when DISCONNECTEDJason2016-06-221-1/+1
| | * [web] store ws object in symbol propertyJason2016-06-221-3/+5
| | * Merge remote-tracking branch 'origin/master' into websocketJason2016-06-2213-86/+117
| | |\
| | * \ Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocketJason2016-06-189-166/+148
| | |\ \
| | * | | [web] add app ducksJason2016-06-183-11/+43
| | * | | Merge branch 'master' into websocketJason2016-06-1737-1509/+1467
| | |\ \ \
| | * | | | [web] websocketJason2016-06-174-76/+110
* | | | | | [web] bug fixJason2016-06-243-8/+12
* | | | | | [web] fix bugsJason2016-06-246-21/+35
* | | | | | [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] 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-232-2/+2
|\| | | | |
| * | | | | [web] updateSettings -> handleWsMsgJason2016-06-222-2/+2
| | |_|_|/ | |/| | |
* | | | | [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
|/ / / /
* | | | add better descriptionMaximilian Hils2016-06-202-7/+8
* | | | added tests for uiClemens2016-06-204-6/+41
* | | | added accept and revert to flowmenuClemens2016-06-202-6/+10
* | | | [web] replace SetttingsActions.update with settings.updateSettingsJason2016-06-197-75/+65
| |_|/ |/| |
* | | add setInterceptPattern action creatorMaximilian Hils2016-06-172-3/+13
* | | add fetchApi.put shortcutMaximilian Hils2016-06-171-3/+15
* | | simplify settings reducerMaximilian Hils2016-06-173-57/+56
* | | [web] simplify settingsJason2016-06-171-36/+8
* | | Merge branch 'master' into settingsJason2016-06-1737-1514/+1472
|\ \ \ | | |/ | |/|
| * | [web] clean upJason2016-06-172-9/+2
| * | [web] commonJason2016-06-1711-183/+194
| * | [web] editor config for line endingsJason2016-06-173-224/+225
| * | [web] Editor & PromptJason2016-06-179-344/+339