aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2499 from mhils/rawtcpMaximilian Hils2017-08-042-4/+14
|\
| * Revert "Remove promotion to raw TCP based on heuristics"Maximilian Hils2017-08-031-1/+10
| * improve docstring for rawtcpMaximilian Hils2017-08-031-3/+4
|/
* Merge pull request #2475 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-08-021-2/+2
|\
| * [requires.io] dependency updaterequires.io2017-08-021-2/+2
|/
* Merge pull request #2496 from Kriechi/bump-pyasnThomas Kriechbaumer2017-08-022-6/+4
|\
| * bump dependencyThomas Kriechbaumer2017-08-021-1/+1
| * update for pyasn1 0.3Ujjwal Verma2017-08-021-5/+3
|/
* Merge pull request #2493 from Kriechi/improve-testsMaximilian Hils2017-08-021-188/+233
|\
| * improve proxyauth testsThomas Kriechbaumer2017-08-021-188/+233
|/
* Merge pull request #2490 from mitmproxy/issue-2334Maximilian Hils2017-08-011-1/+1
|\
| * Update proxyauth.pyMaximilian Hils2017-08-011-1/+1
* | fix mitmproxy invocationMaximilian Hils2017-08-011-1/+1
|/
* add LogEntry.__eq__Maximilian Hils2017-08-012-0/+10
* Merge pull request #2487 from mhils/no-option-processingMaximilian Hils2017-08-019-14/+20
|\
| * remove OptManager._processedMaximilian Hils2017-07-319-14/+20
* | Merge pull request #2488 from MatthewShao/options-into-own-addonMaximilian Hils2017-07-311-1/+1
|\ \
| * | Fix minor typing mistake.Matthew Shao2017-07-311-1/+1
|/ /
* | Merge pull request #2484 from mhils/options-into-own-addonMaximilian Hils2017-07-3127-170/+183
|\|
| * minor fixesMaximilian Hils2017-07-302-5/+5
| * move isatty check to a better placeMaximilian Hils2017-07-302-6/+5
| * fix tflow.js creation on Windows.Maximilian Hils2017-07-301-1/+1
| * fix tool-specific cmdlineMaximilian Hils2017-07-304-30/+34
| * disentangle ProxyServer and Master classes.Maximilian Hils2017-07-3023-121/+130
| * move web options into their own addonMaximilian Hils2017-07-293-19/+20
* | Merge pull request #2485 from mhils/silent-option-redeclarationMaximilian Hils2017-07-302-1/+20
|\ \
| * | make option redeclaration silent if signature is the sameMaximilian Hils2017-07-302-1/+20
* | | Merge pull request #2482 from mhils/pure-script-loadMaximilian Hils2017-07-303-51/+43
|\ \ \ | |/ / |/| |
| * | make load_script pureMaximilian Hils2017-07-303-51/+43
| |/
* | Merge pull request #2483 from mhils/ignore-imports-with-hook-namesMaximilian Hils2017-07-302-3/+16
|\ \
| * | gracefully ignore imports with hook namesMaximilian Hils2017-07-292-3/+16
| |/
* | Merge pull request #2481 from mhils/option-typehintsMaximilian Hils2017-07-305-3/+123
|\ \ | |/ |/|
| * fix type hints for mitmproxy.ctxMaximilian Hils2017-07-291-3/+3
| * add option type hintsMaximilian Hils2017-07-292-0/+113
| * add OptManager.itemsMaximilian Hils2017-07-292-0/+7
|/
* Merge pull request #2452 from mattweidner/add_intercept_toggleMaximilian Hils2017-07-297-1/+31
|\
| * Extended intercept tests to include toggle featureMatt Weidner2017-07-271-0/+12
| * Changed statusbar indicator to 'X' inside the intercept filter bracketsMatt Weidner2017-07-271-2/+2
| * Fixed boolean evaluation syntax inconsistencyMatt Weidner2017-07-271-1/+1
| * Fixed indentationMatt Weidner2017-07-271-2/+2
| * Add intercetp toggle feature.Matt Weidner2017-07-276-1/+19
* | Merge pull request #2480 from MatthewShao/mitmweb-optionsMaximilian Hils2017-07-299-10/+24
|\ \
| * | Fix lint error.Matthew Shao2017-07-281-1/+1
| * | Update tests for the improved verbosity options.Matthew Shao2017-07-284-4/+4
| * | Improve verbosity options.Matthew Shao2017-07-285-6/+20
| |/
* | Merge pull request #2471 from ujjwal96/traceback-fixMaximilian Hils2017-07-297-15/+19
|\ \
| * | updated snapshotUjjwal Verma2017-07-281-2/+2
| * | fixed addon errorUjjwal Verma2017-07-266-13/+17
* | | Merge pull request #2478 from pauloromeira/fix-typoThomas Kriechbaumer2017-07-291-3/+3
|\ \ \ | |_|/ |/| |
| * | docs: Fix typoPaulo Romeira2017-07-291-3/+3
|/ /
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-19 00:55:47 +0000