aboutsummaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into websocketJason2016-06-1737-1509/+1467
|\ | | | | | | | | | | | | Conflicts: mitmproxy/web/static/app.css mitmproxy/web/static/app.js web/src/js/components/ProxyApp.jsx
| * [web] clean upJason2016-06-172-9/+2
| |
| * [web] commonJason2016-06-1711-183/+194
| |
| * [web] editor config for line endingsJason2016-06-173-224/+225
| |
| * [web] Editor & PromptJason2016-06-179-344/+339
| |
| * [web] FlowView and ContentViewJason2016-06-1721-989/+947
| |
* | [web] websocketJason2016-06-174-76/+110
|/
* web: fix testsMaximilian Hils2016-06-162-12/+9
|
* web: use implicit bindActionCreatorsMaximilian Hils2016-06-155-15/+10
|
* minor fixesMaximilian Hils2016-06-153-14/+19
|
* rename view -> ui, make code more readableClemens2016-06-153-11/+12
|
* add previous state to dispatch functionClemens2016-06-154-20/+30
|
* code reviewClemens2016-06-143-41/+17
|
* added flowMenuClemens2016-06-146-14/+124
|
* [web] header.js -> Header.jsJason2016-06-0911-469/+516
|
* [web] eventlog.js -> EventLog.jsxJason2016-06-095-155/+143
|
* [web] footer.js -> Footer.jsxJason2016-06-092-25/+22
|
* [web] fix shortcut for header fieldsJason2016-06-092-1/+2
|
* [web] separate flowtable to multiple filesJason2016-06-0912-357/+364
|
* [web] fix updateLocationJason2016-06-093-7/+12
|
* [web] rewrite ProxyApp and MainView with es6Jason2016-06-096-356/+385
|
* fix default websocket stateMaximilian Hils2016-06-081-2/+2
|
* sorting add pr review changesClemens2016-06-084-17/+26
|
* sorting done, ready to reviewClemens2016-06-071-1/+1
|
* sorting done, ready to reviewClemens2016-06-073-34/+26
|
* moved redux state injection closer to childClemens2016-06-072-4/+6
|
* start with sort, continue tomorrowClemens2016-06-072-6/+3
|
* moved sort state to redux, missing apply sortClemens2016-06-073-47/+62
|
* web: accept all falsey sortFns in sortedIndexOfMaximilian Hils2016-06-061-8/+4
|
* web: fix list update propagationMaximilian Hils2016-06-052-3/+6
|
* web: modernize flow table columnsMaximilian Hils2016-06-052-223/+148
|
* web: update reactMaximilian Hils2016-06-051-3/+2
|
* web: fix list reducerMaximilian Hils2016-06-051-3/+3
|
* web: completely move flow state to reduxMaximilian Hils2016-06-048-330/+191
|
* web interleave old store and redux flow stateMaximilian Hils2016-06-043-4/+17
|
* web: implement update and remove for list and viewMaximilian Hils2016-06-043-20/+95
|
* web: add flows to redux stateMaximilian Hils2016-06-034-6/+40
|
* web: add redux list viewsMaximilian Hils2016-06-033-7/+73
|
* web: remove old event log storeMaximilian Hils2016-06-035-45/+7
|
* web: implement redux store fetchingMaximilian Hils2016-06-037-38/+160
|
* Merge branch 'redux-ducks'Maximilian Hils2016-06-0214-197/+289
|\
| * web: fix eventlog height registrationMaximilian Hils2016-06-021-11/+16
| |
| * web: reduxify event log storeMaximilian Hils2016-06-029-80/+85
| |
| * web: reduxify WebSocketMaximilian Hils2016-06-026-26/+81
| |
| * remove reducers directoryMaximilian Hils2016-06-021-8/+0
| |
| * web: :hatching_chick:Maximilian Hils2016-06-0212-180/+138
| |
| * use object spread operatorMaximilian Hils2016-06-022-3/+4
| | | | | | | | | | While the spread operator is not part of ES6, React also uses it for JSX. It makes sense for us to keep it in other parts of the codebase as well.
| * add basic redux architecture, convert eventlog to reduxMaximilian Hils2016-06-027-25/+99
| |
| * add redux as dependencyMaximilian Hils2016-06-011-0/+2
| |
* | fix dumpfile uploadMaximilian Hils2016-06-021-9/+6
| |