Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2234 from ujjwal96/ip-formatting | Maximilian Hils | 2017-04-10 | 5 | -6/+32 |
|\ | | | | | Fixes IP address formatting #2109 | ||||
| * | Fixes #2109 | Ujjwal Verma | 2017-04-09 | 5 | -6/+32 |
|/ | |||||
* | Merge pull request #2232 from r1b/master | Maximilian Hils | 2017-04-09 | 2 | -1/+4 |
|\ | | | | | fixes ipv6 authority form parsing in CONNECT | ||||
| * | fixes ipv6 authority form parsing in CONNECT | Robert C Jensen | 2017-04-07 | 2 | -1/+4 |
|/ | |||||
* | Merge pull request #2227 from vinaydargar/grammarphrasing | Maximilian Hils | 2017-04-04 | 2 | -2/+2 |
|\ | | | | | Replace phrase 'the the' in 2 places | ||||
| * | Replace phrase 'the the' in 2 places | Vinay Dargar | 2017-04-02 | 2 | -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-1 | Thomas Kriechbaumer | 2017-03-29 | 1 | -4/+4 |
|\ | | | | | Replace phrase "an TLS" with "a TLS" | ||||
| * | Replace phrase "an TLS" with "a TLS" | jonathanrfisher1 | 2017-03-29 | 1 | -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-logbuffer | Thomas Kriechbaumer | 2017-03-29 | 1 | -0/+16 |
|\ | | | | | Add tests for set_focus | ||||
| * | Add tests for set_focus | Nikhil Soni | 2017-03-29 | 1 | -0/+16 |
| | | |||||
* | | Merge pull request #2222 from BasThomas/patch-1 | Thomas Kriechbaumer | 2017-03-29 | 1 | -6/+6 |
|\ \ | | | | | | | Add syntax highlighting to Readme | ||||
| * | | Add syntax highlighting to Readme | Bas Broek | 2017-03-29 | 1 | -6/+6 |
|/ / | |||||
* | | Merge pull request #2220 from krsoninikhil/empty-logbuffer | Thomas Kriechbaumer | 2017-03-28 | 1 | -0/+4 |
|\| | | | | | eventlog: Override set_focus to check for index error | ||||
| * | Override set_focus to check for index error | Nikhil Soni | 2017-03-29 | 1 | -0/+4 |
|/ | |||||
* | Merge pull request #2212 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-27 | 3 | -2/+35 |
|\ | | | | | [web] Update Jest config and coverage ++ | ||||
| * | [web] Minor fixes for the test. | Matthew Shao | 2017-03-26 | 2 | -7/+10 |
| | | |||||
| * | [web] Exclude src/js/filt/filt.js from coverage report. | Matthew Shao | 2017-03-26 | 1 | -1/+4 |
| | | |||||
| * | [web] Add JS coverage to codecov. | Matthew Shao | 2017-03-26 | 2 | -3/+7 |
| | | |||||
| * | [web] Reach 100% coverage for ducks/settings.js | Matthew Shao | 2017-03-26 | 1 | -0/+23 |
| | | |||||
* | | Merge pull request #2215 from mitmproxy/proxapp.local-1 | Maximilian Hils | 2017-03-26 | 1 | -2/+2 |
|\ \ | | | | | | | proxapp -> proxapp.local | ||||
| * | | proxapp -> proxapp.local | Maximilian Hils | 2017-03-26 | 1 | -2/+2 |
|/ / | | | | | Chrome doesn't like it if there's no TLD. | ||||
* | | Merge pull request #2213 from Kriechi/concurrent-coverage | Maximilian Hils | 2017-03-25 | 1 | -4/+4 |
|\ \ | |/ |/| | fix #2201 | ||||
| * | fix #2201 | Thomas Kriechbaumer | 2017-03-25 | 1 | -4/+4 |
|/ | |||||
* | Merge pull request #2206 from cortesi/addonload | Aldo Cortesi | 2017-03-25 | 28 | -70/+209 |
|\ | | | | | addon refactoring | ||||
| * | addon loader: add boot_into, which replaces returning from start() | Aldo Cortesi | 2017-03-25 | 23 | -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() event | Aldo Cortesi | 2017-03-25 | 2 | -3/+32 |
| | | |||||
| * | addons: start -> load throughout | Aldo Cortesi | 2017-03-25 | 25 | -49/+49 |
|/ | |||||
* | Merge pull request #2208 from Kriechi/bump-h2 | Maximilian Hils | 2017-03-24 | 3 | -8/+16 |
|\ | | | | | bump h2 | ||||
| * | bump h2 | Thomas Kriechbaumer | 2017-03-24 | 3 | -8/+16 |
|/ | |||||
* | Merge pull request #2207 from nikofil/scripts-redirect-stdout | Aldo Cortesi | 2017-03-24 | 3 | -7/+38 |
|\ | | | | | scripts: redirect stdout to ctx.log.warn | ||||
| * | scripts: redirect stdout to ctx.log.warn | Nikos Filippakis | 2017-03-24 | 3 | -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/consoleopts | Aldo Cortesi | 2017-03-24 | 3 | -11/+64 |
|\ \ | | | | | | | console options: load and save options to and from file | ||||
| * | | optmanager: make serialization and loading more robust | Aldo Cortesi | 2017-03-24 | 3 | -13/+47 |
| | | | | | | | | | | | | Also handle errors in console options manager. | ||||
| * | | console: read and write options to and from file | Aldo Cortesi | 2017-03-23 | 1 | -1/+20 |
| |/ | |||||
* | | Merge pull request #2203 from cortesi/malformedreq | Aldo Cortesi | 2017-03-24 | 1 | -5/+10 |
|\ \ | |/ |/| | Don't pass malformed request objects to our error handler | ||||
| * | Don't pass malformed request objects to our error handler | Aldo Cortesi | 2017-03-23 | 1 | -5/+10 |
|/ | |||||
* | Merge pull request #2200 from MatthewShao/jest-dev | Maximilian Hils | 2017-03-22 | 2 | -1/+41 |
|\ | | | | | Add coverage for eventLog.js and update Jest config. | ||||
| * | [web] Update configuration of jest to avoid deprecation warning | Matthew Shao | 2017-03-22 | 1 | -1/+1 |
| | | |||||
| * | [web] Reach 100% coverage for ducks/eventLog.js | Matthew Shao | 2017-03-22 | 1 | -0/+40 |
| | | |||||
* | | move examples tests (#2199) | Thomas Kriechbaumer | 2017-03-22 | 4 | -85/+115 |
|/ | |||||
* | Fix#2184, mitmweb -n dispalys incorrect message. (#2187) | Matthew Shao | 2017-03-22 | 3 | -10/+9 |
| | | | | | | | | * Fixes #2184, python code. * Fixes #2184, JavaScript code. * [web] Update Footer.jsx (#2184) | ||||
* | Merge pull request #2190 from cortesi/mypy | Aldo Cortesi | 2017-03-22 | 23 | -84/+104 |
|\ | | | | | mypy for all of ./mitmproxy | ||||
| * | tox: mypy checking for entire codebase | Aldo Cortesi | 2017-03-22 | 5 | -17/+8 |
| | | | | | | | | Also fix a few linting errors. | ||||
| * | Make tnetstrings pass mypy | Aldo Cortesi | 2017-03-20 | 1 | -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 module | Aldo Cortesi | 2017-03-20 | 9 | -6/+13 |
| | | | | | | | | | | Include tnetstring - we've made enough changes that this no longer belongs in contrib. | ||||
| * | mypy all of the codebase bar tnetstring | Aldo Cortesi | 2017-03-20 | 14 | -55/+77 |
| | | | | | | | | | | | | In some places, this involved removing type declarations where our types were terminally confused. The grideditor specifically needs a cleanup and restructure. | ||||
* | | [requires.io] dependency update on master branch (#2193) | Maximilian Hils | 2017-03-21 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2186 from cortesi/tighten | Aldo Cortesi | 2017-03-20 | 18 | -75/+103 |
|\| | | | | | Tighten some options-related functionality | ||||
| * | Fix sliding window type specs | Aldo Cortesi | 2017-03-20 | 1 | -2/+2 |
| | | |||||
| * | addons.view: we no longer have a None order state | Aldo Cortesi | 2017-03-20 | 1 | -9/+6 |
| | | | | | | | | This bumps coverage back to 100% for addons |