| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | modify flow content | Clemens | 2016-07-11 | 6 | -12/+55 |
| | | |||||
| * | [web] add tests for utils | Jason | 2016-06-27 | 7 | -34/+236 |
| | | |||||
| * | 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 | 14 | -114/+84 |
| | | |||||
| * | [web] sorter -> sort | Maximilian Hils | 2016-06-25 | 3 | -42/+42 |
| | | |||||
| * | [web] log only in dev | Jason | 2016-06-25 | 1 | -3/+9 |
| | | |||||
| * | [web] build with envify | Jason | 2016-06-25 | 2 | -0/+3 |
| | | |||||
| * | [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 | 2 | -1/+18 |
| | | |||||
| * | [web] fix actions | Jason | 2016-06-25 | 13 | -83/+127 |
| | | |||||
| * | [web] fix selectFlows | Jason | 2016-06-25 | 4 | -7/+9 |
| | | |||||
| * | [web] add msgQueue | Jason | 2016-06-25 | 8 | -191/+233 |
| | | |||||
| * | Merge branch 'master' of github.com:mitmproxy/mitmproxy into list | Jason | 2016-06-24 | 5 | -95/+169 |
| |\ | | | | | | | | | | | | | | | 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 Hils | 2016-06-23 | 5 | -95/+168 |
| | |\ | |||||
| | | * | [web] set connected to false when DISCONNECTED | Jason | 2016-06-22 | 1 | -1/+1 |
| | | | | |||||
| | | * | [web] store ws object in symbol property | Jason | 2016-06-22 | 1 | -3/+5 |
| | | | | |||||
| | | * | Merge remote-tracking branch 'origin/master' into websocket | Jason | 2016-06-22 | 13 | -86/+117 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| | | * \ | Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket | Jason | 2016-06-18 | 9 | -166/+148 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx web/src/js/connection.js | ||||
| | | * | | | [web] add app ducks | Jason | 2016-06-18 | 3 | -11/+43 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into websocket | Jason | 2016-06-17 | 37 | -1509/+1467 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| | | * | | | | [web] websocket | Jason | 2016-06-17 | 4 | -76/+110 |
| | | | | | | | |||||
| * | | | | | | [web] bug fix | Jason | 2016-06-24 | 3 | -8/+12 |
| | | | | | | | |||||
| * | | | | | | [web] fix bugs | Jason | 2016-06-24 | 6 | -21/+35 |
| | | | | | | | |||||
| * | | | | | | [web] fix eventLog flow | Jason | 2016-06-24 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | [web] reduce eventlog view | Jason | 2016-06-24 | 1 | -1/+4 |
| | | | | | | | |||||
| * | | | | | | [web] code format | Jason | 2016-06-24 | 1 | -2/+6 |
| | | | | | | | |||||
| * | | | | | | [web] fix view data structure | Jason | 2016-06-24 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | [web] fix flows data flow | Jason | 2016-06-24 | 6 | -14/+15 |
| | | | | | | | |||||
| * | | | | | | [web] ws methods | Jason | 2016-06-23 | 2 | -21/+43 |
| | | | | | | | |||||
| * | | | | | | [web] check item existence before update | Jason | 2016-06-23 | 2 | -2/+8 |
| | | | | | | | |||||
| * | | | | | | [web] fix eventLog ducks | Jason | 2016-06-23 | 6 | -71/+100 |
| | | | | | | | |||||
| * | | | | | | [web] separate views and list | Jason | 2016-06-23 | 6 | -173/+413 |
| | | | | | | | |||||
| * | | | | | | [web] fix data connection | Jason | 2016-06-23 | 7 | -13/+12 |
| | | | | | | | |||||
| * | | | | | | [web] fix utils/list | Jason | 2016-06-23 | 3 | -27/+30 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' of github.com:mitmproxy/mitmproxy into list | Jason | 2016-06-23 | 2 | -2/+2 |
| |\| | | | | | |||||
| | * | | | | | [web] updateSettings -> handleWsMsg | Jason | 2016-06-22 | 2 | -2/+2 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | [web] connect new ducks actions | Jason | 2016-06-23 | 10 | -28/+31 |
| | | | | | | |||||
| * | | | | | [web] fix ducks/flows | Jason | 2016-06-23 | 2 | -9/+18 |
| | | | | | | |||||
| * | | | | | [web] remove ducks/utils/view | Jason | 2016-06-23 | 1 | -134/+0 |
| | | | | | | |||||
| * | | | | | [web] flows.makeFun | Jason | 2016-06-23 | 1 | -14/+21 |
| | | | | | | |||||
| * | | | | | [web] FlowActions -> flows ducks | Jason | 2016-06-23 | 2 | -55/+83 |
| | | | | | | |||||
| * | | | | | [web] refactoring ducks/flows | Jason | 2016-06-23 | 3 | -80/+109 |
| | | | | | | |||||
| * | | | | | [web] finish utils/list | Jason | 2016-06-23 | 3 | -153/+153 |
| | | | | | | |||||
| * | | | | | [web] use a dummy action to init list | Jason | 2016-06-22 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | [web] update eventlog | Jason | 2016-06-22 | 1 | -53/+103 |
| |/ / / / | |||||
| * | | | | add better description | Maximilian Hils | 2016-06-20 | 2 | -7/+8 |
| | | | | | |||||
| * | | | | added tests for ui | Clemens | 2016-06-20 | 4 | -6/+41 |
| | | | | | |||||
| * | | | | added accept and revert to flowmenu | Clemens | 2016-06-20 | 2 | -6/+10 |
| | | | | | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |