| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | simplify web ui ducks | Maximilian Hils | 2016-07-19 | 6 | -16/+14 |
| | | |||||
| * | Merge remote-tracking branch 'jason/ui' | Maximilian Hils | 2016-07-18 | 11 | -362/+119 |
| |\ | |||||
| | * | [web] add tests for main view and ui | Jason | 2016-07-08 | 1 | -4/+5 |
| | | | |||||
| | * | [web] bug fixs | Jason | 2016-07-05 | 7 | -143/+58 |
| | |\ | |||||
| | | * | [web] set display large | Jason | 2016-07-05 | 4 | -70/+47 |
| | | | | |||||
| | | * | [web] listen to window.onKeyDown | Jason | 2016-07-05 | 5 | -75/+13 |
| | | | | |||||
| | * | | [web] bug fix | Jason | 2016-07-05 | 2 | -3/+3 |
| | |/ | |||||
| | * | [web] change ducks/ui | Jason | 2016-07-05 | 5 | -228/+60 |
| | | | |||||
| | * | [web] ui ducks for content view | Jason | 2016-07-01 | 2 | -15/+24 |
| | | | |||||
| * | | fixed bug (#1342) | Clemens Brunner | 2016-07-12 | 1 | -2/+2 |
| |/ | | | fix minor mitmweb issues | ||||
| * | fix mitmproxy/mitmweb#25 | Maximilian Hils | 2016-06-26 | 4 | -22/+17 |
| | | |||||
| * | [web] (mostly) remove jQuery | Maximilian Hils | 2016-06-26 | 2 | -5/+10 |
| | | |||||
| * | minor fixes | Maximilian Hils | 2016-06-26 | 10 | -97/+71 |
| | | |||||
| * | [web] sorter -> sort | Maximilian Hils | 2016-06-25 | 1 | -6/+6 |
| | | |||||
| * | [web] ErrorView | Jason | 2016-06-25 | 2 | -1/+18 |
| | | |||||
| * | [web] fix actions | Jason | 2016-06-25 | 11 | -72/+109 |
| | | |||||
| * | [web] fix selectFlows | Jason | 2016-06-25 | 2 | -3/+3 |
| | | |||||
| * | Merge branch 'master' of github.com:mitmproxy/mitmproxy into list | Jason | 2016-06-24 | 1 | -22/+36 |
| |\ | | | | | | | | | | | | | | | 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 'origin/master' into websocket | Jason | 2016-06-22 | 7 | -48/+64 |
| | |\ | | | | | | | | | | | | | | | | 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 | 2 | -54/+34 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -3/+5 |
| | | | | | |||||
| | * | | | Merge branch 'master' into websocket | Jason | 2016-06-17 | 35 | -1508/+1463 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| | * | | | | [web] websocket | Jason | 2016-06-17 | 1 | -10/+18 |
| | | | | | | |||||
| * | | | | | [web] bug fix | Jason | 2016-06-24 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | [web] fix eventLog flow | Jason | 2016-06-24 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | [web] fix flows data flow | Jason | 2016-06-24 | 4 | -12/+12 |
| | | | | | | |||||
| * | | | | | [web] fix eventLog ducks | Jason | 2016-06-23 | 1 | -7/+1 |
| | | | | | | |||||
| * | | | | | [web] fix data connection | Jason | 2016-06-23 | 5 | -10/+9 |
| | | | | | | |||||
| * | | | | | [web] connect new ducks actions | Jason | 2016-06-23 | 5 | -13/+12 |
| | | | | | | |||||
| * | | | | | [web] refactoring ducks/flows | Jason | 2016-06-23 | 1 | -1/+1 |
| | |_|_|/ |/| | | | |||||
| * | | | | added accept and revert to flowmenu | Clemens | 2016-06-20 | 2 | -6/+10 |
| | | | | | |||||
| * | | | | [web] replace SetttingsActions.update with settings.updateSettings | Jason | 2016-06-19 | 5 | -43/+54 |
| | |_|/ |/| | | |||||
| * | | | add setInterceptPattern action creator | Maximilian Hils | 2016-06-17 | 1 | -3/+8 |
| | | | | |||||
| * | | | simplify settings reducer | Maximilian Hils | 2016-06-17 | 1 | -10/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into settings | Jason | 2016-06-17 | 35 | -1513/+1468 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| | * | | [web] clean up | Jason | 2016-06-17 | 2 | -9/+2 |
| | | | | |||||
| | * | | [web] common | Jason | 2016-06-17 | 11 | -183/+194 |
| | | | | |||||
| | * | | [web] editor config for line endings | Jason | 2016-06-17 | 2 | -224/+224 |
| | | | | |||||
| | * | | [web] Editor & Prompt | Jason | 2016-06-17 | 9 | -344/+339 |
| | | | | |||||
| | * | | [web] FlowView and ContentView | Jason | 2016-06-17 | 20 | -988/+944 |
| | |/ | |||||
| * | | [web] fix settings ducks | Jason | 2016-06-17 | 1 | -1/+9 |
| | | | |||||
| * | | [web] settings store | Jason | 2016-06-17 | 1 | -30/+3 |
| |/ | |||||
| * | web: use implicit bindActionCreators | Maximilian Hils | 2016-06-15 | 5 | -15/+10 |
| | | |||||
| * | minor fixes | Maximilian Hils | 2016-06-15 | 1 | -3/+3 |
| | | |||||
| * | rename view -> ui, make code more readable | Clemens | 2016-06-15 | 1 | -2/+2 |
| | | |||||
| * | add previous state to dispatch function | Clemens | 2016-06-15 | 1 | -13/+15 |
| | | |||||
| * | code review | Clemens | 2016-06-14 | 2 | -16/+11 |
| | | |||||
| * | added flowMenu | Clemens | 2016-06-14 | 4 | -13/+71 |
| | | |||||
| * | [web] header.js -> Header.js | Jason | 2016-06-09 | 11 | -469/+516 |
| | | |||||
| * | [web] eventlog.js -> EventLog.jsx | Jason | 2016-06-09 | 5 | -155/+143 |
| | | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |