aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Doc and readme tweaks.Aldo Cortesi2014-01-196-20/+37
| * Refactor docs to define nav sidebar in only one place.Aldo Cortesi2014-01-194-95/+51
| * Tweak setup.py to allow installs outside source dirAldo Cortesi2014-01-192-2/+8
| * Optionally take the mitmproxy path for doc rendering from a env variable.Aldo Cortesi2014-01-191-1/+1
| * PyInstaller bug requiring a console import in mitmdump is goneAldo Cortesi2014-01-191-2/+1
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-1915-24/+90
| |\
| * | Handle views that don't support search gracefullyAldo Cortesi2014-01-191-3/+12
| * | Re-enable caching on search.Aldo Cortesi2014-01-191-10/+3
* | | Add functionality to transparently proxify connections to other HTTPS proxiesMaximilian Hils2014-01-182-6/+37
* | | merge masterMaximilian Hils2014-01-1840-202/+2031
|\ \ \ | | |/ | |/|
| * | fix sni bug: respond with the correct certificateMaximilian Hils2014-01-161-5/+5
| * | fix syntax highlighting for countershape urls by using different quotesMaximilian Hils2014-01-146-16/+16
| * | add tutorial for transparent proxying, other minor docs improvementsMaximilian Hils2014-01-1410-9/+75
| |/
| * Deprecate Flow.unload_script in favor of Flow.unload_scriptsAldo Cortesi2014-01-132-9/+12
| * Extract command parsing and use in script grid editorAldo Cortesi2014-01-133-13/+19
| * Script refactoring: move script command parsing into script module.Aldo Cortesi2014-01-129-54/+49
| * Clean up and clarify script APIAldo Cortesi2014-01-124-30/+17
| * Start refactoring scriptsAldo Cortesi2014-01-126-86/+83
| * ignore console test utilities on windowsMaximilian Hils2014-01-101-2/+3
| * display build status from master branchMaximilian Hils2014-01-091-1/+1
| * Merge pull request #199 from dwilbraham/add_protobuffer_content_typeMaximilian Hils2014-01-061-1/+4
| |\
| | * Update ViewProtobuf in contentview.py to also decode as protobuf if the conte...Dan Wilbraham2014-01-051-1/+4
| |/
| * Tweaking web stub app, icons for certificates, serve PEM correctly.Aldo Cortesi2014-01-0511-7/+1779
| * Remove / binding alias for limitAldo Cortesi2014-01-051-2/+1
* | get server reconnect right, fix timestampsMaximilian Hils2014-01-182-65/+71
* | small refactorings, bugs fixedMaximilian Hils2014-01-182-30/+69
* | add basic error handlingMaximilian Hils2014-01-132-79/+97
* | fix header assembly, other improvementsMaximilian Hils2014-01-102-41/+69
* | improve https handlingMaximilian Hils2014-01-092-33/+56
* | groundwork completedMaximilian Hils2014-01-092-116/+336
* | Delete ~$$proxy-flowchart.~vsdxMaximilian Hils2014-01-071-0/+0
* | continue work on the proxyhandlerMaximilian Hils2014-01-0729-290/+664
|\|
| * Merge pull request #192 from mitmproxy/refactor_read_http_bodyAldo Cortesi2014-01-042-8/+18
| |\
| | * move CONTINUE checks into mitmproxyMaximilian Hils2013-12-152-8/+18
| * | Merge pull request #193 from droope/search-functionalityAldo Cortesi2014-01-045-43/+353
| |\ \
| | * | now really fix it + testPedro Worcel2013-12-262-6/+29
| | * | fix bug that happens after searching for a non-existant string, andPedro Worcel2013-12-261-1/+6
| | * | add docsPedro Worcel2013-12-261-1/+2
| | * | added 'n' functionality, tidy up & testingPedro Worcel2013-12-261-1/+9
| | * | add looping aroundPedro Worcel2013-12-262-53/+137
| | * | fix failing testPedro Worcel2013-12-251-1/+2
| | * | fix crashroot2013-12-251-2/+2
| | * | Add focusing, and fixes non-clearance of prev searches. Addroot2013-12-253-45/+139
| | * | test passing, UI still not workingroot2013-12-244-6/+99
| | * | add search with / for compatibility with what I'll do.root2013-12-231-1/+2
| * | | Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmprox...Aldo Cortesi2014-01-054-8/+7
| |\ \ \
| | * | | Update another reference to PIL.Tomaz Muraus2014-01-041-1/+3
| | * | | Migrate from Pil to the latest version of Pillow.Tomaz Muraus2014-01-033-8/+5
| * | | | Merge pull request #198 from Kami/add_css_viewAldo Cortesi2014-01-045-2/+63
| |\ \ \ \
| | * | | | Fix CSS view prompt, update display mode options.Tomaz Muraus2014-01-042-1/+5