aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #2710 from jimhigson/update-ios-instructionsThomas Kriechbaumer2017-12-211-5/+5
|\
| * minor docs improvementsMaximilian Hils2017-12-181-6/+3
| * move extra info for ios to ios sectionjimhigson2017-12-181-5/+8
* | Merge pull request #2716 from cortesi/cmdfixesAldo Cortesi2017-12-208-3/+49
|\ \
| * | cuts: don't crash when retrieving header of a non-existent responseAldo Cortesi2017-12-202-0/+7
| * | console: ignore non-nav keys in chooserAldo Cortesi2017-12-202-2/+28
| * | console options: retain focus position after editAldo Cortesi2017-12-201-0/+1
| * | "Commands" title -> "Command Reference"Aldo Cortesi2017-12-201-1/+1
| * | commands: don't try to view flow returns as dataAldo Cortesi2017-12-201-0/+4
| * | console: add console.bodyview.optionsAldo Cortesi2017-12-201-0/+8
* | | Merge pull request #2715 from cortesi/fancycommander2Aldo Cortesi2017-12-206-7/+144
|\| |
| * | commander: command argument underlayAldo Cortesi2017-12-203-3/+90
| * | commander: palette entries, highlight errorsAldo Cortesi2017-12-206-6/+56
* | | Merge pull request #2714 from cortesi/commander1Aldo Cortesi2017-12-206-85/+105
|\| |
| * | commander: highlight commandsAldo Cortesi2017-12-205-29/+55
| * | commands: partial parser now returns help for remaining argumentsAldo Cortesi2017-12-195-61/+55
* | | Merge pull request #2712 from cortesi/types3Aldo Cortesi2017-12-198-197/+279
|\| |
| * | types: add validation to partial parserAldo Cortesi2017-12-193-18/+39
| * | types: use new type validation mechanism in commandsAldo Cortesi2017-12-196-99/+33
| * | types: add validation functionsAldo Cortesi2017-12-192-6/+129
| * | types: cleanups and minor refactoringsAldo Cortesi2017-12-195-76/+80
* | | Merge pull request #2705 from mhils/issue-2694Maximilian Hils2017-12-181-0/+22
|\ \ \ | |/ / |/| |
| * | implement body editing, fix #2694Maximilian Hils2017-12-181-0/+22
* | | Merge pull request #2702 from Kriechi/fix-2640Thomas Kriechbaumer2017-12-1814-19/+128
|\ \ \ | |/ / |/| |
| * | add doc stringThomas Kriechbaumer2017-12-181-0/+5
| * | add testsThomas Kriechbaumer2017-12-185-3/+33
| * | 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