aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | add testslymanZerga112017-03-091-1/+1
| | |
| * | Add testslymanZerga112017-03-091-0/+1
| | |
| * | add type hintsMaximilian Hils2017-03-081-2/+2
| | |
| * | Update proxyauth.pylymanZerga112017-03-081-1/+1
| | |
| * | Update proxyauth.pylymanZerga112017-03-081-2/+3
| | |
* | | Merge pull request #2114 from mitmproxy/fix-websocket-serializationThomas Kriechbaumer2017-03-107-32/+71
|\ \ \ | | | | | | | | make websocket flows serializable
| * | | use flow.id to link websocket + handshake flowsThomas Kriechbaumer2017-03-101-1/+2
| | | |
| * | | make websocket flows serializableThomas Kriechbaumer2017-03-097-31/+69
| | |/ | |/| | | | | | | fixes #2113
* | | Merge pull request #2128 from Kriechi/disable-more-h2cThomas Kriechbaumer2017-03-105-40/+82
|\ \ \ | | | | | | | | disable h2c prior knowledge connections
| * | | disable h2c prior knowledge connectionsThomas Kriechbaumer2017-03-105-40/+82
| |/ /
* | | Merge pull request #2131 from MatthewShao/jest-devMaximilian Hils2017-03-103-287/+0
|\ \ \ | |/ / |/| | [web] remove the tests for abandoned files.
| * | [web] remove the tests for abandoned files.Matthew Shao2017-03-103-287/+0
|/ /
* | Merge pull request #2100 from cortesi/optionsAldo Cortesi2017-03-0952-1459/+1334
|\ \ | | | | | | Options revamp
| * | 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 openSUSE
| * | | 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 leftovers
| * | | | fix tcp.Address leftoversMaximilian Hils2017-03-081-1/+1
| | |_|/ | |/| | | | | | this fixes the issue described in https://github.com/mitmproxy/mitmproxy/issues/2119#issuecomment-285067292
* | | | Merge pull request #2090 from mitmproxy/fix-pathod-header-docThomas Kriechbaumer2017-03-081-2/+2
|\ \ \ \ | |_|/ / |/| | | pathoc: fix documentation for headers
| * | | pathoc: fix documentation for headersMaximilian Hils2017-03-021-2/+2
| | | |
* | | | Merge pull request #2117 from MatthewShao/jest-devMaximilian Hils2017-03-081-0/+12
|\ \ \ \ | |_|/ / |/| | | Add Javascript tests to Travis CI. (#2093)
| * | | 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
| | | | | | | | | | | | | | | `typing.Type` should have been `typing.Type[Any]`, which in turn is equivalent to `type`
| | * core -> core_option_validationMaximilian Hils2017-03-083-7/+7
| | | | | | | | | | | | longer, but much clearer for devs who are unfamiliar with the codebase.
| | * change add_option parameter orderMaximilian Hils2017-03-084-110/+111
| | | | | | | | | | | | | | | name, type, value matches natural language ($x is a bool with a default value of $y) and also matches the python type annotation order of name: type = value
| | * 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
|\ \ \ | | | | | | | | Update tcpproxy.rst
| * | | fix other occurences of options shortcutMaximilian Hils2017-03-078-10/+10
| | | |
| * | | Update tcpproxy.rstYamamori Akihiro2017-03-071-1/+1
| | | | | | | | | | | | Correction in key short cut for TCP Proxy
* | | | Revert "clearly indentify git-checkout as dev version"Maximilian Hils2017-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | This temporarily reverts commit 3b4d8d6ecae3ee1f57dd71af990bb480e6c82d6c, which broke the snapshot builds.
* | | | Merge pull request #2106 from davidpshaw/python_3_to_masterMaximilian Hils2017-03-073-4/+4
|\ \ \ \ | |/ / / |/| | | Updated for python 3
| * | | 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 filter
| * | | | web: Add websocket filterSachin Kelkar2017-03-062-84/+111
| |/ / /
* | | | Merge pull request #2104 from lymanZerga11/patch-2Maximilian Hils2017-03-061-1/+1
|\ \ \ \ | | | | | | | | | | Fixes #2102
| * | | | 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 version
| * | | 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] Add mouse support for FilterInput popover.
| * | | | [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
| | | | | | | | | | | | | | | | | | | | The mechanism for booleans attaches the short flag to whatever the opposite of the default is.
| | | * Change the way proxy authetication is specifiedAldo Cortesi2017-03-075-58/+51
| | | | | | | | | | | | | | | | | | | | | | | | We now have one option "proxyauth". If this is "any", we accept any credentials, if it starts with an @ it's treated as a path to an htpasswd file, if it is of the form username:password it's a single-user credential.
| | | * Add type and choices to options dump commets.Aldo Cortesi2017-03-072-21/+34
| | | |
| | | * Options tweaksAldo Cortesi2017-03-074-111/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Regularise presentation and wording - Help is mandatory for all options - Auto-generate wording to say that sequence options can be passed multiple times on the command-line
| | | * Remove less commonly used command-line optionsAldo Cortesi2017-03-073-74/+5
| | | | | | | | | | | | | | | | | | | | | | | | We now have --set, so only options that really deserve it get a dedicated flag. I'm inclined to strip this back even more. Feel free to argue that YOUR favourite option deserves special treatment here.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-26 12:21:21 +0000