aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | merge masterMaximilian Hils2014-01-28106-41/+5870
|\|
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-283-12/+13
| |\
| | * actually remove test dependencies from requirements.txtMaximilian Hils2014-01-283-12/+13
| * | docs: fix spacing of page headersAldo Cortesi2014-01-281-1/+5
| |/
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-282-3/+7
| |\
| | * move test requirements out of main requirements.txtMaximilian Hils2014-01-282-3/+7
| * | Changelog.Aldo Cortesi2014-01-281-0/+18
| |/
| * Update contributors.Aldo Cortesi2014-01-281-10/+19
| * travis: irc notificationsAldo Cortesi2014-01-281-0/+7
| * Adjust docs for web app certificate installation.Aldo Cortesi2014-01-289-37/+75
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-282-4/+16
| |\
| | * print warning if netlib and mitmproxy versions are different.Maximilian Hils2014-01-222-4/+16
| * | Nicer layout for cert install options.Aldo Cortesi2014-01-282-12/+24
| * | Instructions for adding mitmproxy certificates to the Java trust store.Aldo Cortesi2014-01-273-0/+15
| * | Use the mitm.it domain for the app, turn it on by default.Aldo Cortesi2014-01-271-3/+3
| * | Android doc update.Aldo Cortesi2014-01-271-2/+5
| * | Revert "Move the doc tree out into its own repo."Aldo Cortesi2014-01-2791-0/+5706
| * | Serve correct certs from app. Enable Windows and Android icons.Aldo Cortesi2014-01-242-8/+8
| |/
* | unify ipv4/ipv6 address handlingMaximilian Hils2014-01-284-36/+28
* | merge masterMaximilian Hils2014-01-22105-5769/+102
|\|
| * travis: install netlib from git before installing requirements.Aldo Cortesi2014-01-221-1/+1
| * Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-220-0/+0
| |\
| | * Add note on emulated android devices. refs #204Maximilian Hils2014-01-211-2/+5
| * | Move the doc tree out into its own repo.Aldo Cortesi2014-01-2292-5707/+1
| |/
| * Silence pyflakesAldo Cortesi2014-01-198-20/+15
| * Release test script and checklist.Aldo Cortesi2014-01-192-0/+62
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 14:00:58 +0000