aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [web] Fix line breaking in StringSequenceOption.Matthew Shao2017-07-191-1/+1
* [web] sorting the options and minor improve ux.Matthew Shao2017-07-183-267/+13
* Merge branch 'mitmweb-options' of https://github.com/MatthewShao/mitmproxy in...Matthew Shao2017-07-1839-256/+1109
|\
| * [web] options: add some styling, minor fixesMaximilian Hils2017-07-172-19/+36
| * [web] options: make help and err permanently visible, improve perfMaximilian Hils2017-07-1710-338/+260
| * [web] Update OptionMaster.Matthew Shao2017-07-172-73/+44
| * [web] Add reducer and actions for option editor.Matthew Shao2017-07-172-1/+42
| * [web] Add simple validation and improve UI.Matthew Shao2017-07-173-18/+61
| * [web] Update error msg in PUT /options API.Matthew Shao2017-07-171-1/+1
| * [web] Update tests.Matthew Shao2017-07-171-4/+16
| * [web] Try StringSequence update logic and add tooltip.Matthew Shao2017-07-171-38/+138
| * [web] Update test.Matthew Shao2017-07-171-80/+99
| * [web] Add PureStringSequenceOption type to OptionMaster.jsxMatthew Shao2017-07-172-48/+82
| * Merge pull request #2427 from ujjwal96/protobufThomas Kriechbaumer2017-07-1010-65/+372
| |\
| | * Kaitai parser for protobufUjjwal Verma2017-07-1010-65/+372
| * | [requires.io] dependency update on master branch (#2426)Thomas Kriechbaumer2017-07-091-1/+1
| * | Merge pull request #2423 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-0512-17/+305
| |\ \
| * | | 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
| |\ \
| * \ \ Merge pull request #2418 from ujjwal96/script-addonMaximilian Hils2017-06-282-1/+24
| |\ \ \
| | * | | Fixes #2315Ujjwal Verma2017-06-282-1/+24
| |/ / /
* | | | [web] Update OptionMaster.Matthew Shao2017-07-172-73/+44
* | | | [web] Add reducer and actions for option editor.Matthew Shao2017-07-172-1/+42
* | | | [web] Add simple validation and improve UI.Matthew Shao2017-07-153-18/+61
* | | | [web] Update error msg in PUT /options API.Matthew Shao2017-07-151-1/+1
* | | | [web] Update tests.Matthew Shao2017-07-101-4/+16
* | | | [web] Try StringSequence update logic and add tooltip.Matthew Shao2017-07-101-38/+138
* | | | [web] Update test.Matthew Shao2017-07-071-80/+99
* | | | [web] Add PureStringSequenceOption type to OptionMaster.jsxMatthew Shao2017-07-072-48/+82
| |_|/ |/| |
* | | 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
| |/ |/|
* | [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