aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jest-dev' of https://github.com/MatthewShao/mitmproxy into jest...Matthew Shao2017-04-2527-101/+368
|\
| * simplify selectRelative, add example for action testingMaximilian Hils2017-04-244-98/+120
| * [web] Coverage++ for ducks/flows.jsMatthew Shao2017-04-241-3/+158
| * Merge pull request #2256 from ujjwal96/ip-formattingThomas Kriechbaumer2017-04-222-3/+4
| |\
| | * Fixed formatting in mitmdumpUjjwal Verma2017-04-222-3/+4
| |/
| * [requires.io] dependency update on master branch (#2252)Maximilian Hils2017-04-201-1/+1
| * [requires.io] dependency update on master branch (#2241)Maximilian Hils2017-04-171-2/+2
| * Merge pull request #2240 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-04-161-1/+1
| |\
| | * Update setup.pyMaximilian Hils2017-04-161-1/+1
| | * [requires.io] dependency updaterequires.io2017-04-161-1/+1
| |/
| * Merge pull request #2239 from Kriechi/update-kaitaiMaximilian Hils2017-04-1610-28/+69
| |\
| | * 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 #2109Ujjwal Verma2017-04-095-6/+32
| |/
| * Merge pull request #2232 from r1b/masterMaximilian Hils2017-04-092-1/+4
| |\
| | * 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 placesVinay Dargar2017-04-022-2/+2
| |/
| * Merge pull request #2224 from jonathanrfisher1/patch-1Thomas Kriechbaumer2017-03-291-4/+4
| |\
| | * Replace phrase "an TLS" with "a TLS"jonathanrfisher12017-03-291-4/+4
| |/
| * Merge pull request #2223 from krsoninikhil/empty-logbufferThomas Kriechbaumer2017-03-291-0/+16
| |\
| | * 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 ReadmeBas Broek2017-03-291-6/+6
| |/ /
| * | Merge pull request #2220 from krsoninikhil/empty-logbufferThomas Kriechbaumer2017-03-281-0/+4
| |\|
| | * Override set_focus to check for index errorNikhil Soni2017-03-291-0/+4
| |/
* / [web] Coverage++ for ducks/flows.jsMatthew Shao2017-03-281-3/+158
|/
* Merge pull request #2212 from MatthewShao/jest-devMaximilian Hils2017-03-273-2/+35
|\
| * [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.localMaximilian Hils2017-03-261-2/+2
|/ /
* | Merge pull request #2213 from Kriechi/concurrent-coverageMaximilian Hils2017-03-251-4/+4
|\ \ | |/ |/|
| * fix #2201Thomas Kriechbaumer2017-03-251-4/+4
|/
* Merge pull request #2206 from cortesi/addonloadAldo Cortesi2017-03-2528-70/+209
|\
| * addon loader: add boot_into, which replaces returning from start()Aldo Cortesi2017-03-2523-48/+158
| * 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 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.warnNikos Filippakis2017-03-243-7/+38
* | Merge pull request #2204 from cortesi/consoleoptsAldo Cortesi2017-03-243-11/+64
|\ \
| * | optmanager: make serialization and loading more robustAldo Cortesi2017-03-243-13/+47
| * | 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 handlerAldo Cortesi2017-03-231-5/+10
|/
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 12:39:00 +0000