aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [web] Load dumped options at start up.Matthew Shao2017-07-261-0/+6
* [web] Update options auto dump for frontend.Matthew Shao2017-07-263-26/+6
* [web] Update POST /options/dump API in backend.Matthew Shao2017-07-261-9/+3
* [web] Update tests.Matthew Shao2017-07-243-2/+44
* [web] Add Download/Load button to OptionEditor.Matthew Shao2017-07-242-1/+28
* [web] Add /options/dump API to backend.Matthew Shao2017-07-241-1/+18
* [web] Update OptManager.save() to suit the need of mitmweb.Matthew Shao2017-07-241-5/+11
* [web] OptionModal component coverge ++.Matthew Shao2017-07-223-1/+116
* [web] Update tests.Matthew Shao2017-07-211-0/+33
* [web] Add default value suggester in option editor.Matthew Shao2017-07-211-0/+27
* Merge pull request #2430 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-2017-236/+679
|\
| * [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 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
| * | [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
|\ \ \
| * | | update mypyMaximilian Hils2017-07-204-14/+14
| * | | fix type declarationMaximilian Hils2017-07-201-1/+1
| * | | shorten option helpMaximilian Hils2017-07-203-18/+17
| * | | make eventsequence.iterate extendableMaximilian Hils2017-07-151-39/+55
| * | | remove `--shortversion`Maximilian Hils2017-07-151-6/+1
| | |/ | |/|
* | | Merge pull request #2455 from mhils/script-fixesMaximilian Hils2017-07-203-4/+38
|\ \ \
| * | | 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
|\ \ \
| * | | 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 protobufUjjwal Verma2017-07-1010-65/+372
* | | [requires.io] dependency update on master branch (#2426)Thomas Kriechbaumer2017-07-091-1/+1