aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2265 from cortesi/addonsAldo Cortesi2017-04-2712-155/+141
|\
| * Addons and addon testingAldo Cortesi2017-04-2612-155/+141
* | Merge pull request #2270 from F1ashhimself/masterMaximilian Hils2017-04-261-1/+1
|\ \
| * | Update readme for complex examplesMaksim Beloborodko2017-04-261-1/+1
* | | Merge pull request #2269 from mhils/issue-2250Maximilian Hils2017-04-264-50/+58
|\ \ \ | |/ / |/| |
| * | fix #2250, add type info to cookie moduleMaximilian Hils2017-04-264-50/+58
* | | Merge pull request #2258 from mhils/readfileMaximilian Hils2017-04-2610-152/+147
|\ \ \
| * | | separate reading from stdin into its own addonMaximilian Hils2017-04-266-72/+94
| * | | integrate readstdin into readfile addonMaximilian Hils2017-04-265-127/+92
| * | | typecheck: add support for typing.AnyMaximilian Hils2017-04-262-0/+8
| | |/ | |/|
* | | Merge pull request #2268 from mhils/issue-2257Maximilian Hils2017-04-264-79/+110
|\ \ \
| * | | fix #2257Maximilian Hils2017-04-264-79/+110
* | | | Merge pull request #2267 from MatthewShao/jest-devMaximilian Hils2017-04-262-0/+164
|\ \ \ \ | |_|_|/ |/| | |
| * | | [web] Add coverage for js/utils.js, js/flow/utils.jsMatthew Shao2017-04-262-0/+164
| | |/ | |/|
* | | Merge pull request #2259 from mhils/2228Maximilian Hils2017-04-263-24/+20
|\ \ \ | |_|/ |/| |
| * | fix #2228Maximilian Hils2017-04-263-24/+20
| |/
* / clarify that `--cert` expects a leaf certificateMaximilian Hils2017-04-261-1/+1
|/
* Merge pull request #2262 from Kriechi/reduced-coverage++Aldo Cortesi2017-04-2611-18/+16
|\
| * improve testsThomas Kriechbaumer2017-04-2511-18/+16
* | Merge pull request #2264 from cortesi/optionsAldo Cortesi2017-04-2644-518/+413
|\ \
| * | configure(options, updated) -> configure(updated)Aldo Cortesi2017-04-2629-102/+99
| * | Move options into ctxAldo Cortesi2017-04-2617-235/+199
| * | Remove watchdog, solidify script testingAldo Cortesi2017-04-269-184/+118
* | | Merge pull request #2261 from cortesi/addonrevampAldo Cortesi2017-04-2634-533/+448
|\| |
| * | Revamp how addons workAldo Cortesi2017-04-2534-533/+448
| |/
* | Merge pull request #2219 from MatthewShao/jest-devMaximilian Hils2017-04-254-52/+245
|\ \ | |/ |/|
| * Fix the tests for flows actions.Matthew Shao2017-04-252-169/+31
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-10 02:17:59 +0000