aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | ignore contrib type errorsThomas Kriechbaumer2017-12-183-0/+7
| * | fix #2640Thomas Kriechbaumer2017-12-188-13/+63
| * | websocket: support domain and url filtersThomas Kriechbaumer2017-12-183-5/+22
| |/
* | Merge pull request #2707 from cortesi/addtypesAldo Cortesi2017-12-1917-313/+591
|\ \ | |/ |/|
| * commands: refactor typesAldo Cortesi2017-12-1817-313/+591
|/
* Merge pull request #2700 from mhils/issue-2697Aldo Cortesi2017-12-181-7/+25
|\
| * fix #2697Maximilian Hils2017-12-171-7/+25
* | Merge pull request #2698 from mhils/issue-2658Aldo Cortesi2017-12-182-2/+3
|\ \
| * | update evenlog when verbosity changesMaximilian Hils2017-12-171-1/+2
| * | log contentview errors in the debug log onlyMaximilian Hils2017-12-171-1/+1
| |/
* | Merge pull request #2690 from cortesi/typesAldo Cortesi2017-12-1834-29/+29
|\ \ | |/ |/|
| * mitmproxy.types -> mitmproxy.coretypesAldo Cortesi2017-12-1734-29/+29
* | Merge pull request #2691 from Kriechi/bump-cryptographyThomas Kriechbaumer2017-12-171-1/+1
|\ \
| * | bump cryptographyThomas Kriechbaumer2017-12-171-1/+1
|/ /
* | Merge pull request #2689 from cortesi/grideditor.saveAldo Cortesi2017-12-172-0/+21
|\ \
| * | console: add console.grideditor.saveAldo Cortesi2017-12-172-0/+21
* | | Merge pull request #2687 from cortesi/minor1Aldo Cortesi2017-12-174-22/+21
|\| | | |/ |/|
| * commands: minor refactoring and command renamingAldo Cortesi2017-12-174-22/+21
* | Merge pull request #2686 from cortesi/flowspecoptsAldo Cortesi2017-12-172-1/+35
|\|
| * commander: add completion for flowspecsAldo Cortesi2017-12-172-1/+35
* | Merge pull request #2685 from cortesi/longoutAldo Cortesi2017-12-1718-183/+311
|\|
| * Disable implicit JS test asset generationAldo Cortesi2017-12-172-3/+3
| * console: add a data view overlay for command outputAldo Cortesi2017-12-177-8/+123
| * minor: commandeditor.py -> commandexecutor.pyAldo Cortesi2017-12-173-4/+4
| * minor: fix key bindings, adjust flow command presentationAldo Cortesi2017-12-173-3/+3
| * command cuts: add completionAldo Cortesi2017-12-1710-92/+145
| * commands: Reassess the cuts APIAldo Cortesi2017-12-175-118/+78
|/
* Merge pull request #2682 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-12-161-1/+1
|\
| * [requires.io] dependency updaterequires.io2017-12-151-1/+1
|/
* Merge pull request #2679 from cortesi/commander2Aldo Cortesi2017-12-168-151/+124
|\
| * commander: test++Aldo Cortesi2017-12-152-9/+51
| * commander: sort options for completionAldo Cortesi2017-12-151-0/+1
| * command: path completionAldo Cortesi2017-12-154-145/+51
| * console: fix variable clash exposed by recent key binding workAldo Cortesi2017-12-152-2/+2
| * command: recursive command parsingAldo Cortesi2017-12-152-2/+26
|/
* Merge pull request #2678 from mhils/console-startup-eventsAldo Cortesi2017-12-157-72/+85
|\
| * improve eventstore truncationMaximilian Hils2017-12-153-23/+38
| * limit eventstore sizeMaximilian Hils2017-12-142-4/+11
| * console: display errors that happened during startupMaximilian Hils2017-12-141-3/+16
| * streamline console logging, fix #2667Maximilian Hils2017-12-146-60/+38
* | Merge pull request #2677 from cortesi/commanderAldo Cortesi2017-12-1510-19/+355
|\ \ | |/ |/|
| * command: add command.Arg typeAldo Cortesi2017-12-153-10/+19
| * commands: emit types from partial parser, implement choice completionAldo Cortesi2017-12-153-20/+66
| * commander: tab completion for command namesAldo Cortesi2017-12-153-10/+77
| * WIP: autocompletionAldo Cortesi2017-12-155-23/+72
| * commands: add a parser for partial commandsAldo Cortesi2017-12-152-0/+35
| * commands: add a Cmd argument typeAldo Cortesi2017-12-158-20/+35
| * Introduce a custom widget for command editingAldo Cortesi2017-12-155-11/+126
|/
* Merge pull request #2674 from mhils/issue-2620Aldo Cortesi2017-12-151-9/+10
|\
| * fix #2620Maximilian Hils2017-12-141-9/+10