aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [requires.io] dependency updaterequires.io2017-04-161-1/+1
|
* Merge pull request #2239 from Kriechi/update-kaitaiMaximilian Hils2017-04-1610-28/+69
|\ | | | | update kaitai and recompile formats
| * manually fix importsThomas Kriechbaumer2017-04-162-7/+5
| |
| * update kaitai and recompile formatsThomas Kriechbaumer2017-04-1610-31/+74
|/
* Merge pull request #2234 from ujjwal96/ip-formattingMaximilian Hils2017-04-105-6/+32
|\ | | | | Fixes IP address formatting #2109
| * Fixes #2109Ujjwal Verma2017-04-095-6/+32
|/
* Merge pull request #2232 from r1b/masterMaximilian Hils2017-04-092-1/+4
|\ | | | | fixes ipv6 authority form parsing in CONNECT
| * fixes ipv6 authority form parsing in CONNECTRobert C Jensen2017-04-072-1/+4
|/
* Merge pull request #2227 from vinaydargar/grammarphrasingMaximilian Hils2017-04-042-2/+2
|\ | | | | Replace phrase 'the the' in 2 places
| * Replace phrase 'the the' in 2 placesVinay Dargar2017-04-022-2/+2
|/ | | | Replaced with the appropriate "in the" and "to the". There are multiple other occurences of this but they are in upstream python modules.
* Merge pull request #2224 from jonathanrfisher1/patch-1Thomas Kriechbaumer2017-03-291-4/+4
|\ | | | | Replace phrase "an TLS" with "a TLS"
| * Replace phrase "an TLS" with "a TLS"jonathanrfisher12017-03-291-4/+4
|/ | | Updating usage of 'a' or 'an' to be more consistent with general English grammatical rules. TLS is pronounced with a consonant sound for both the expanded and abbreviated versions.
* Merge pull request #2223 from krsoninikhil/empty-logbufferThomas Kriechbaumer2017-03-291-0/+16
|\ | | | | Add tests for set_focus
| * Add tests for set_focusNikhil Soni2017-03-291-0/+16
| |
* | Merge pull request #2222 from BasThomas/patch-1Thomas Kriechbaumer2017-03-291-6/+6
|\ \ | | | | | | Add syntax highlighting to Readme
| * | Add syntax highlighting to ReadmeBas Broek2017-03-291-6/+6
|/ /
* | Merge pull request #2220 from krsoninikhil/empty-logbufferThomas Kriechbaumer2017-03-281-0/+4
|\| | | | | eventlog: Override set_focus to check for index error
| * Override set_focus to check for index errorNikhil Soni2017-03-291-0/+4
|/
* Merge pull request #2212 from MatthewShao/jest-devMaximilian Hils2017-03-273-2/+35
|\ | | | | [web] Update Jest config and coverage ++
| * [web] Minor fixes for the test.Matthew Shao2017-03-262-7/+10
| |
| * [web] Exclude src/js/filt/filt.js from coverage report.Matthew Shao2017-03-261-1/+4
| |
| * [web] Add JS coverage to codecov.Matthew Shao2017-03-262-3/+7
| |
| * [web] Reach 100% coverage for ducks/settings.jsMatthew Shao2017-03-261-0/+23
| |
* | Merge pull request #2215 from mitmproxy/proxapp.local-1Maximilian Hils2017-03-261-2/+2
|\ \ | | | | | | proxapp -> proxapp.local
| * | proxapp -> proxapp.localMaximilian Hils2017-03-261-2/+2
|/ / | | | | Chrome doesn't like it if there's no TLD.
* | Merge pull request #2213 from Kriechi/concurrent-coverageMaximilian Hils2017-03-251-4/+4
|\ \ | |/ |/| fix #2201
| * fix #2201Thomas Kriechbaumer2017-03-251-4/+4
|/
* Merge pull request #2206 from cortesi/addonloadAldo Cortesi2017-03-2528-70/+209
|\ | | | | addon refactoring
| * addon loader: add boot_into, which replaces returning from start()Aldo Cortesi2017-03-2523-48/+158
| | | | | | | | | | While we're here, expand test coverage for addonmanager to 100%, and promote to individual coverage.
| * addons: an addonmanager.Loader is now passed to the load() eventAldo Cortesi2017-03-252-3/+32
| |
| * addons: start -> load throughoutAldo Cortesi2017-03-2525-49/+49
|/
* Merge pull request #2208 from Kriechi/bump-h2Maximilian Hils2017-03-243-8/+16
|\ | | | | bump h2
| * bump h2Thomas Kriechbaumer2017-03-243-8/+16
|/
* Merge pull request #2207 from nikofil/scripts-redirect-stdoutAldo Cortesi2017-03-243-7/+38
|\ | | | | scripts: redirect stdout to ctx.log.warn
| * scripts: redirect stdout to ctx.log.warnNikos Filippakis2017-03-243-7/+38
| | | | | | | | | | | | | | Redirect messages written to stdout in scripts to ctx.log.warn. (closes #1530) Signed-off-by: Nikos Filippakis <nikolaos.filippakis@cern.ch>
* | Merge pull request #2204 from cortesi/consoleoptsAldo Cortesi2017-03-243-11/+64
|\ \ | | | | | | console options: load and save options to and from file
| * | optmanager: make serialization and loading more robustAldo Cortesi2017-03-243-13/+47
| | | | | | | | | | | | Also handle errors in console options manager.
| * | console: read and write options to and from fileAldo Cortesi2017-03-231-1/+20
| |/
* | Merge pull request #2203 from cortesi/malformedreqAldo Cortesi2017-03-241-5/+10
|\ \ | |/ |/| Don't pass malformed request objects to our error handler
| * Don't pass malformed request objects to our error handlerAldo Cortesi2017-03-231-5/+10
|/
* Merge pull request #2200 from MatthewShao/jest-devMaximilian Hils2017-03-222-1/+41
|\ | | | | Add coverage for eventLog.js and update Jest config.
| * [web] Update configuration of jest to avoid deprecation warningMatthew Shao2017-03-221-1/+1
| |
| * [web] Reach 100% coverage for ducks/eventLog.jsMatthew Shao2017-03-221-0/+40
| |
* | move examples tests (#2199)Thomas Kriechbaumer2017-03-224-85/+115
|/
* Fix#2184, mitmweb -n dispalys incorrect message. (#2187)Matthew Shao2017-03-223-10/+9
| | | | | | | | * Fixes #2184, python code. * Fixes #2184, JavaScript code. * [web] Update Footer.jsx (#2184)
* Merge pull request #2190 from cortesi/mypyAldo Cortesi2017-03-2223-84/+104
|\ | | | | mypy for all of ./mitmproxy
| * tox: mypy checking for entire codebaseAldo Cortesi2017-03-225-17/+8
| | | | | | | | Also fix a few linting errors.
| * Make tnetstrings pass mypyAldo Cortesi2017-03-201-10/+10
| | | | | | | | | | | | | | | | Mypy doesn't support recursive types yet, so we can't properly express TSerializable nested structures. For now, we just disable type checking in the appropriate locations. https://github.com/python/mypy/issues/731
| * Factor out an io moduleAldo Cortesi2017-03-209-6/+13
| | | | | | | | | | Include tnetstring - we've made enough changes that this no longer belongs in contrib.
| * mypy all of the codebase bar tnetstringAldo Cortesi2017-03-2014-55/+77
| | | | | | | | | | | | In some places, this involved removing type declarations where our types were terminally confused. The grideditor specifically needs a cleanup and restructure.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 04:08:58 +0000