aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #2430 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2017-236/+679
|\ \ | | | | | | [web] [WIP] Mitmweb options
| * | [web] Remove js/ducks/ui/option.jsMatthew Shao2017-07-202-78/+0
| | |
| * | [web] Minor fix and update tests.Matthew Shao2017-07-2012-83/+404
| | |
| * | [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 ↵Matthew Shao2017-07-1839-256/+1109
| |\ \ | | | | | | | | | | | | into mitmweb-options
| | * | [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
| | | |
| * | | [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
| | | |
* | | | Merge pull request #2454 from mhils/minor-improvementsMaximilian Hils2017-07-206-63/+73
|\ \ \ \ | | | | | | | | | | Minor improvements
| * | | | update mypyMaximilian Hils2017-07-204-14/+14
| | | | |
| * | | | fix type declarationMaximilian Hils2017-07-201-1/+1
| | | | |
| * | | | shorten option helpMaximilian Hils2017-07-203-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | We can have longer versions in the docs, but this makes the options pages quite hard to parse.
| * | | | make eventsequence.iterate extendableMaximilian Hils2017-07-151-39/+55
| | | | |
| * | | | remove `--shortversion`Maximilian Hils2017-07-151-6/+1
| | |/ / | |/| | | | | | | | | | this has no benefit over --version and clutters our cmdline options.
* | | | Merge pull request #2455 from mhils/script-fixesMaximilian Hils2017-07-203-4/+38
|\ \ \ \ | | | | | | | | | | Fix loading scripts with same filename
| * | | | replace deprecated use of SourceFileLoader.load_moduleMaximilian Hils2017-07-201-2/+4
| | | | |
| * | | | fix loading scripts with same filenameMaximilian Hils2017-07-203-3/+35
|/ / / /
* | | | Merge pull request #2436 from ujjwal96/addonThomas Kriechbaumer2017-07-153-0/+69
|\ \ \ \ | | | | | | | | | | Allow remote Addon
| * | | | Update test_allowremote.pyThomas Kriechbaumer2017-07-151-31/+28
| | | | |
| * | | | Allow remote addonUjjwal Verma2017-07-153-0/+72
|/ / / /
* / / / make issue template more conciseMaximilian Hils2017-07-131-7/+1
|/ / /
* | | Merge pull request #2427 from ujjwal96/protobufThomas Kriechbaumer2017-07-1010-65/+372
|\ \ \ | | | | | | | | Kaitai parser for protobuf
| * | | 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
|\ \ \ \ | | |/ / | |/| | [web] [WIP] Mitmweb options editor content
| * | | 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
| | | |