aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Send change event when options are resetAldo Cortesi2017-03-091-0/+1
* Merge remote-tracking branch 'upstream/master' into optionsAldo Cortesi2017-03-094-3/+29
|\
| * Merge pull request #2124 from mitmproxy/opensuse-docsMaximilian Hils2017-03-081-0/+14
| |\
| | * add install docs for openSUSEMaximilian Hils2017-03-081-0/+14
| * | Merge pull request #2121 from mitmproxy/address-leftoversMaximilian Hils2017-03-081-1/+1
| |\ \
| | * | fix tcp.Address leftoversMaximilian Hils2017-03-081-1/+1
| * | | Merge pull request #2090 from mitmproxy/fix-pathod-header-docThomas Kriechbaumer2017-03-081-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | pathoc: fix documentation for headersMaximilian Hils2017-03-021-2/+2
| * | | Merge pull request #2117 from MatthewShao/jest-devMaximilian Hils2017-03-081-0/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Update .travis.ymlMatthew Shao2017-03-081-9/+6
| | * | Add javascript tests to Travis CI. (#2093)Matthew Shao2017-03-081-0/+15
| |/ /
* | | typing.Type -> typeMaximilian Hils2017-03-081-2/+2
* | | core -> core_option_validationMaximilian Hils2017-03-083-7/+7
* | | change add_option parameter orderMaximilian Hils2017-03-084-110/+111
* | | unify server spec parsingMaximilian Hils2017-03-087-54/+118
* | | Merge remote-tracking branch 'upstream/master' into optionsAldo Cortesi2017-03-0818-102/+142
|\| |
| * | Merge pull request #2108 from ayamamori/patch-1Maximilian Hils2017-03-079-11/+11
| |\ \
| | * | fix other occurences of options shortcutMaximilian Hils2017-03-078-10/+10
| | * | Update tcpproxy.rstYamamori Akihiro2017-03-071-1/+1
| * | | Revert "clearly indentify git-checkout as dev version"Maximilian Hils2017-03-071-1/+1
| * | | Merge pull request #2106 from davidpshaw/python_3_to_masterMaximilian Hils2017-03-073-4/+4
| |\ \ \ | | |/ / | |/| |
| | * | Updated for python 3David Shaw2017-03-063-4/+4
| * | | Merge pull request #2101 from s4chin/add-websocket-filter-to-webMaximilian Hils2017-03-062-84/+111
| |\ \ \
| | * | | web: Add websocket filterSachin Kelkar2017-03-062-84/+111
| | |/ /
| * | | Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
| |\ \ \
| | * | | Update flowlist.pylymanZerga112017-03-061-1/+1
| | |/ /
| * | | Merge pull request #2105 from Kriechi/dev-versionMaximilian Hils2017-03-061-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | clearly indentify git-checkout as dev versionThomas Kriechbaumer2017-03-061-1/+1
| * | | Merge pull request #2085 from MatthewShao/devMaximilian Hils2017-03-053-2/+15
| |\ \ \
| | * | | [web] Retain focus on input field after selecting. (#2085)Matthew Shao2017-03-041-0/+1
| | * | | [web] Simplify the code. (#2085)Matthew Shao2017-03-031-6/+2
| | * | | [web] Add mouse support for FilterInput popover.Matthew Shao2017-03-023-3/+19
| | |/ /
* | | | Carefully re-add a small number of short flagsAldo Cortesi2017-03-076-39/+48
* | | | Change the way proxy authetication is specifiedAldo Cortesi2017-03-075-58/+51
* | | | Add type and choices to options dump commets.Aldo Cortesi2017-03-072-21/+34
* | | | Options tweaksAldo Cortesi2017-03-074-111/+131
* | | | Remove less commonly used command-line optionsAldo Cortesi2017-03-073-74/+5
* | | | Add the --set option to set options directlyAldo Cortesi2017-03-074-6/+100
* | | | Option spacing and coverageAldo Cortesi2017-03-073-15/+37
* | | | Add --options that dumps annotated option defaultsAldo Cortesi2017-03-074-5/+39
* | | | Fix lintAldo Cortesi2017-03-071-1/+1
* | | | Flatten commandline arg structure, extract common run func for toolsAldo Cortesi2017-03-072-100/+51
* | | | Cleanups and test coverageAldo Cortesi2017-03-0710-26/+45
* | | | Automate slurping up command-line optionsAldo Cortesi2017-03-076-124/+23
* | | | Replacements and setheaders are always stringsAldo Cortesi2017-03-064-44/+38
* | | | Unify mode specificationAldo Cortesi2017-03-0614-129/+80
* | | | Options unification: certsAldo Cortesi2017-03-063-30/+23
* | | | Options unification: streamfileAldo Cortesi2017-03-064-30/+11
* | | | Options unification: string choicesAldo Cortesi2017-03-064-46/+66
* | | | Options unification: simple string sequencesAldo Cortesi2017-03-063-76/+73