aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #2423 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-0512-17/+305
|\ \ \ | | |/ | |/|
| * | Fix the test for websocket connection.Matthew Shao2017-07-051-2/+22
| * | [web] Update Option Modal UI and its tests.Matthew Shao2017-07-054-47/+147
| * | [web] Update css for modal.Matthew Shao2017-07-052-0/+11
| * | [web] List all options in option modal.Matthew Shao2017-07-051-8/+9
| * | [web] Broadcast options update in backend.Matthew Shao2017-07-051-0/+10
| * | [web] Add keys argument for dump_dict in optmanager.Matthew Shao2017-07-055-52/+144
| * | [web] Try toggle options in option modal.Matthew Shao2017-07-024-1/+56
| * | [web] Change the response format of GET /options.Matthew Shao2017-07-021-5/+4
* | | update dependenciesMaximilian Hils2017-07-051-2/+2
* | | Merge pull request #2369 from ujjwal96/stream-supportThomas Kriechbaumer2017-07-0418-144/+433
|\ \ \ | |_|/ |/| |
| * | minor docs improvementsMaximilian Hils2017-07-041-12/+11
| * | add websocket streaming optionUjjwal Verma2017-07-043-9/+14
| * | update streaming docsUjjwal Verma2017-07-046-73/+108
| * | fix HTTP retry if sending a request fails onceUjjwal Verma2017-07-042-20/+55
| * | websocket streamingUjjwal Verma2017-07-045-36/+96
| * | request streaming for HTTP/2Ujjwal Verma2017-07-043-13/+155
| * | request streaming for HTTP/1Ujjwal Verma2017-07-044-11/+24
|/ /
* | Merge pull request #2416 from MatthewShao/mitmweb-optionsMatthew Shao2017-07-0117-4/+358
|\|
| * [web] Update js/components/Modal/OptionModal.jsxMatthew Shao2017-06-301-0/+45
| * [web] Update tests for components.Matthew Shao2017-06-301-28/+32
| * [web] Update the Structure of Modal component.Matthew Shao2017-06-304-46/+30
| * [web] Add tests for js/components/Modal/ModalSpec.jsMatthew Shao2017-06-292-0/+92
| * [web] Update __tests__/ducks/tutils.jsMatthew Shao2017-06-291-1/+5
| * [web] Add tests for reducors of options and modal.Matthew Shao2017-06-282-0/+50
| * [web] Add src/css/modal.lessMatthew Shao2017-06-281-0/+3
| * [web] Minor update for Modal Component.Matthew Shao2017-06-284-4/+6
| * [web] Update test for js/components/Header/FileMenu.jsxMatthew Shao2017-06-282-1/+27
| * [web] Add Option Modal to FileMenu.Matthew Shao2017-06-281-2/+10
| * [web] Add Modal Component and OptionModalMatthew Shao2017-06-283-0/+69
| * [web] Add modal to js/ducks/ui/index.jsMatthew Shao2017-06-271-0/+2
| * [web] Add js/ducks/options.jsMatthew Shao2017-06-271-0/+32
| * [web] Add js/ducks/ui/modal.jsMatthew Shao2017-06-271-0/+33
* | Merge pull request #2418 from ujjwal96/script-addonMaximilian Hils2017-06-282-1/+24
|\ \ | |/ |/|
| * Fixes #2315Ujjwal Verma2017-06-282-1/+24
|/
* Merge pull request #2402 from ujjwal96/request-replayMaximilian Hils2017-06-272-2/+19
|\
| * request replay testUjjwal Verma2017-06-262-3/+15
| * Fixes #2197Ujjwal Verma2017-06-191-0/+5
* | Merge pull request #2413 from MatthewShao/jest-devMaximilian Hils2017-06-267-2/+406
|\ \
| * | [web] Minor fix and Coverage ++Matthew Shao2017-06-263-7/+8
| * | [web] Add tests for js/components/FlowTable.jsxMatthew Shao2017-06-252-0/+129
| * | [web] Add tests for js/components/EventLog.jsxMatthew Shao2017-06-253-1/+134
| * | [web] Add tests for js/components/ContentView.jsxMatthew Shao2017-06-252-0/+141
|/ /
* | Merge pull request #2412 from ujjwal96/ip-formattingThomas Kriechbaumer2017-06-251-5/+5
|\ \
| * | Few ip formatting fixesUjjwal Verma2017-06-251-5/+5
* | | Merge pull request #2411 from ujjwal96/ico-parserMaximilian Hils2017-06-257-3/+148
|\ \ \
| * | | lint!Ujjwal Verma2017-06-252-6/+7
| * | | Added testUjjwal Verma2017-06-253-7/+30
| * | | ICO Parser. Closes #2407Ujjwal Verma2017-06-245-1/+122
* | | | Merge pull request #2395 from MatthewShao/mitmweb-optionsMaximilian Hils2017-06-246-9/+73
|\ \ \ \