Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | combine content with header updates | Clemens | 2016-07-25 | 1 | -9/+0 |
| | |||||
* | added contentHash | Clemens | 2016-07-25 | 2 | -3/+2 |
| | |||||
* | remove lastFileUpload field | Clemens | 2016-07-25 | 5 | -24/+10 |
| | |||||
* | file upload updates contentview, editable contentloader, diffs on upload | Clemens | 2016-07-22 | 8 | -47/+65 |
| | |||||
* | moved editor to raw_view mode, add content_file_upload | Clemens | 2016-07-21 | 6 | -25/+50 |
| | |||||
* | moved editor to raw_view mode | Clemens | 2016-07-21 | 4 | -41/+39 |
| | |||||
* | web: fix ValueEditor, clean up code | Maximilian Hils | 2016-07-21 | 27 | -747/+657 |
| | |||||
* | added flow_content update | Clemens | 2016-07-19 | 4 | -50/+98 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into flow_editing | Clemens | 2016-07-19 | 30 | -656/+645 |
|\ | |||||
| * | web: fix flow selection | Maximilian Hils | 2016-07-19 | 2 | -2/+2 |
| | | |||||
| * | simplify web ui ducks | Maximilian Hils | 2016-07-19 | 23 | -400/+316 |
| | | |||||
| * | web: remove SELECT_RELATIVE | Maximilian Hils | 2016-07-18 | 3 | -23/+15 |
| | | |||||
| * | Merge remote-tracking branch 'jason/ui' | Maximilian Hils | 2016-07-18 | 15 | -411/+551 |
| |\ | |||||
| | * | [web] add tests for main view and ui | Jason | 2016-07-08 | 3 | -39/+172 |
| | | | |||||
| | * | [web] bug fixs | Jason | 2016-07-05 | 8 | -151/+88 |
| | |\ | |||||
| | | * | [web] set display large | Jason | 2016-07-05 | 5 | -76/+70 |
| | | | | |||||
| | | * | [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 | 7 | -229/+278 |
| | | | |||||
| | * | [web] ui ducks for content view | Jason | 2016-07-01 | 3 | -29/+50 |
| | | | |||||
| * | | fixed bug (#1342) | Clemens Brunner | 2016-07-12 | 2 | -4/+4 |
| |/ | | | | | fix minor mitmweb issues | ||||
* | | moved flow editor state to redux | Clemens | 2016-07-19 | 9 | -58/+118 |
| | | |||||
* | | added new btn, changed to codemirror | Clemens | 2016-07-15 | 7 | -40/+51 |
| | | |||||
* | | change way to edit | Clemens | 2016-07-14 | 8 | -82/+122 |
| | | |||||
* | | chaged editor style | Clemens | 2016-07-13 | 1 | -2/+2 |
| | | |||||
* | | gzip issue | Clemens | 2016-07-13 | 1 | -0/+1 |
| | | |||||
* | | make file out ouf string to combine flow content updates via editor and ↵ | Clemens | 2016-07-13 | 1 | -0/+2 |
| | | | | | | | | fileupload | ||||
* | | added code editor and file upload | Clemens | 2016-07-13 | 8 | -50/+99 |
| | | |||||
* | | 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 |