aboutsummaryrefslogtreecommitdiffstats
path: root/web/src/js/components/ProxyApp.jsx
Commit message (Expand)AuthorAgeFilesLines
* [web] fix actionsJason2016-06-251-4/+5
* Merge remote-tracking branch 'origin/master' into websocketJason2016-06-221-3/+3
|\
| * [web] replace SetttingsActions.update with settings.updateSettingsJason2016-06-191-4/+3
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy into websocketJason2016-06-181-51/+26
|\|
| * simplify settings reducerMaximilian Hils2016-06-171-10/+1
| * Merge branch 'master' into settingsJason2016-06-171-21/+16
| |\
| * | [web] fix settings ducksJason2016-06-171-1/+9
| * | [web] settings storeJason2016-06-171-30/+3
* | | [web] add app ducksJason2016-06-181-3/+5
* | | Merge branch 'master' into websocketJason2016-06-171-16/+11
|\ \ \ | | |/ | |/|
| * | [web] clean upJason2016-06-171-5/+2
| * | [web] FlowView and ContentViewJason2016-06-171-19/+17
| |/
* / [web] websocketJason2016-06-171-10/+18
|/
* [web] header.js -> Header.jsJason2016-06-091-2/+2
* [web] eventlog.js -> EventLog.jsxJason2016-06-091-1/+1
* [web] footer.js -> Footer.jsxJason2016-06-091-1/+1
* [web] fix shortcut for header fieldsJason2016-06-091-1/+1
* [web] separate flowtable to multiple filesJason2016-06-091-0/+170