Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | change import of prop-types | cle1000 | 2017-04-27 | 1 | -1/+2 |
| | |||||
* | clean up mitmweb | Maximilian Hils | 2016-11-08 | 1 | -59/+0 |
| | |||||
* | [web] bug fix | Jason | 2016-08-16 | 1 | -5/+6 |
| | |||||
* | [web] remove react-router | Jason | 2016-08-15 | 1 | -30/+53 |
| | |||||
* | web: fix ValueEditor, clean up code | Maximilian Hils | 2016-07-21 | 1 | -7/+14 |
| | |||||
* | simplify web ui ducks | Maximilian Hils | 2016-07-19 | 1 | -1/+1 |
| | |||||
* | [web] set display large | Jason | 2016-07-05 | 1 | -7/+6 |
| | |||||
* | [web] listen to window.onKeyDown | Jason | 2016-07-05 | 1 | -51/+7 |
| | |||||
* | [web] change ducks/ui | Jason | 2016-07-05 | 1 | -58/+22 |
| | |||||
* | [web] fix actions | Jason | 2016-06-25 | 1 | -4/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into websocket | Jason | 2016-06-22 | 1 | -3/+3 |
|\ | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| * | [web] replace SetttingsActions.update with settings.updateSettings | Jason | 2016-06-19 | 1 | -4/+3 |
| | | |||||
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocket | Jason | 2016-06-18 | 1 | -51/+26 |
|\| | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx web/src/js/connection.js | ||||
| * | simplify settings reducer | Maximilian Hils | 2016-06-17 | 1 | -10/+1 |
| | | |||||
| * | Merge branch 'master' into settings | Jason | 2016-06-17 | 1 | -21/+16 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| * | | [web] fix settings ducks | Jason | 2016-06-17 | 1 | -1/+9 |
| | | | |||||
| * | | [web] settings store | Jason | 2016-06-17 | 1 | -30/+3 |
| | | | |||||
* | | | [web] add app ducks | Jason | 2016-06-18 | 1 | -3/+5 |
| | | | |||||
* | | | Merge branch 'master' into websocket | Jason | 2016-06-17 | 1 | -16/+11 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx | ||||
| * | | [web] clean up | Jason | 2016-06-17 | 1 | -5/+2 |
| | | | |||||
| * | | [web] FlowView and ContentView | Jason | 2016-06-17 | 1 | -19/+17 |
| |/ | |||||
* / | [web] websocket | Jason | 2016-06-17 | 1 | -10/+18 |
|/ | |||||
* | [web] header.js -> Header.js | Jason | 2016-06-09 | 1 | -2/+2 |
| | |||||
* | [web] eventlog.js -> EventLog.jsx | Jason | 2016-06-09 | 1 | -1/+1 |
| | |||||
* | [web] footer.js -> Footer.jsx | Jason | 2016-06-09 | 1 | -1/+1 |
| | |||||
* | [web] fix shortcut for header fields | Jason | 2016-06-09 | 1 | -1/+1 |
| | |||||
* | [web] separate flowtable to multiple files | Jason | 2016-06-09 | 1 | -0/+170 |