aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed typoCharles d'Hondt2017-04-281-1/+1
* Added LDAP AuthCharles d'Hondt2017-04-283-3/+61
* Update README.mdMaximilian Hils2017-04-281-1/+1
* Update README.mdMaximilian Hils2017-04-281-1/+1
* update CHANGELOGMaximilian Hils2017-04-281-0/+16
* fix mitmweb's content security policyMaximilian Hils2017-04-281-1/+1
* Merge pull request #2282 from cortesi/cmddecAldo Cortesi2017-04-2812-105/+176
|\
| * commands: add a command.command decoratorAldo Cortesi2017-04-286-29/+87
| * Support unary flow command argumentsAldo Cortesi2017-04-284-8/+29
| * console: save flows to commandAldo Cortesi2017-04-282-22/+1
| * console: start migrating hotkeys to keymapAldo Cortesi2017-04-288-48/+61
* | Merge pull request #2280 from cortesi/coresetAldo Cortesi2017-04-286-16/+43
|\|
| * command: partialsAldo Cortesi2017-04-284-16/+8
| * commands: add the core command addon, and the command "set"Aldo Cortesi2017-04-283-0/+35
* | Merge pull request #2279 from cortesi/keymapAldo Cortesi2017-04-2812-114/+317
|\|
| * console: add a keymapAldo Cortesi2017-04-286-26/+104
| * console: interactive command browserAldo Cortesi2017-04-2810-91/+216
|/
* Merge pull request #2274 from cortesi/alertsAldo Cortesi2017-04-283-1/+17
|\
| * Add an "alert" log level.Aldo Cortesi2017-04-273-1/+17
* | Merge pull request #2273 from cortesi/commandsAldo Cortesi2017-04-2824-149/+523
|\|
| * Test coverage ++Aldo Cortesi2017-04-274-0/+67
| * command: save.file flowspec path -> NoneAldo Cortesi2017-04-278-41/+89
| * addons.streamfile -> addons.saveAldo Cortesi2017-04-279-38/+38
| * console: flow resolution commandAldo Cortesi2017-04-279-20/+122
| * console: very basic interactive command executorAldo Cortesi2017-04-277-5/+44
| * Basic outline of the command subsystemAldo Cortesi2017-04-277-42/+160
* | Merge pull request #2277 from Kriechi/bump-cryptographyThomas Kriechbaumer2017-04-273-15/+8
|\ \
| * | bump cryptography min-versionThomas Kriechbaumer2017-04-273-15/+8
* | | Merge pull request #2275 from mitmproxy/mitmweb-change-react-prop-typesMaximilian Hils2017-04-2741-4817/+5575
|\ \ \ | |_|/ |/| |
| * | change import of prop-typescle10002017-04-2741-4817/+5575
|/ /
* | Merge pull request #2265 from cortesi/addonsAldo Cortesi2017-04-2712-155/+141
|\ \
| * | Addons and addon testingAldo Cortesi2017-04-2612-155/+141
| |/
* | Merge pull request #2270 from F1ashhimself/masterMaximilian Hils2017-04-261-1/+1
|\ \
| * | Update readme for complex examplesMaksim Beloborodko2017-04-261-1/+1
* | | Merge pull request #2269 from mhils/issue-2250Maximilian Hils2017-04-264-50/+58
|\ \ \ | |/ / |/| |
| * | fix #2250, add type info to cookie moduleMaximilian Hils2017-04-264-50/+58
* | | Merge pull request #2258 from mhils/readfileMaximilian Hils2017-04-2610-152/+147
|\ \ \
| * | | separate reading from stdin into its own addonMaximilian Hils2017-04-266-72/+94
| * | | integrate readstdin into readfile addonMaximilian Hils2017-04-265-127/+92
| * | | typecheck: add support for typing.AnyMaximilian Hils2017-04-262-0/+8
| | |/ | |/|
* | | Merge pull request #2268 from mhils/issue-2257Maximilian Hils2017-04-264-79/+110
|\ \ \
| * | | fix #2257Maximilian Hils2017-04-264-79/+110
* | | | Merge pull request #2267 from MatthewShao/jest-devMaximilian Hils2017-04-262-0/+164
|\ \ \ \ | |_|_|/ |/| | |
| * | | [web] Add coverage for js/utils.js, js/flow/utils.jsMatthew Shao2017-04-262-0/+164
| | |/ | |/|
* | | Merge pull request #2259 from mhils/2228Maximilian Hils2017-04-263-24/+20
|\ \ \ | |_|/ |/| |
| * | fix #2228Maximilian Hils2017-04-263-24/+20
| |/
* / clarify that `--cert` expects a leaf certificateMaximilian Hils2017-04-261-1/+1
|/
* Merge pull request #2262 from Kriechi/reduced-coverage++Aldo Cortesi2017-04-2611-18/+16
|\
| * improve testsThomas Kriechbaumer2017-04-2511-18/+16
* | Merge pull request #2264 from cortesi/optionsAldo Cortesi2017-04-2644-518/+413
|\ \