Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | merge master | Maximilian Hils | 2014-01-28 | 106 | -41/+5870 | |
|\| | ||||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-28 | 3 | -12/+13 | |
| |\ | ||||||
| | * | actually remove test dependencies from requirements.txt | Maximilian Hils | 2014-01-28 | 3 | -12/+13 | |
| | | | ||||||
| * | | docs: fix spacing of page headers | Aldo Cortesi | 2014-01-28 | 1 | -1/+5 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-28 | 2 | -3/+7 | |
| |\ | ||||||
| | * | move test requirements out of main requirements.txt | Maximilian Hils | 2014-01-28 | 2 | -3/+7 | |
| | | | ||||||
| * | | Changelog. | Aldo Cortesi | 2014-01-28 | 1 | -0/+18 | |
| |/ | ||||||
| * | Update contributors. | Aldo Cortesi | 2014-01-28 | 1 | -10/+19 | |
| | | ||||||
| * | travis: irc notifications | Aldo Cortesi | 2014-01-28 | 1 | -0/+7 | |
| | | ||||||
| * | Adjust docs for web app certificate installation. | Aldo Cortesi | 2014-01-28 | 9 | -37/+75 | |
| | | ||||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-28 | 2 | -4/+16 | |
| |\ | ||||||
| | * | print warning if netlib and mitmproxy versions are different. | Maximilian Hils | 2014-01-22 | 2 | -4/+16 | |
| | | | ||||||
| * | | Nicer layout for cert install options. | Aldo Cortesi | 2014-01-28 | 2 | -12/+24 | |
| | | | ||||||
| * | | Instructions for adding mitmproxy certificates to the Java trust store. | Aldo Cortesi | 2014-01-27 | 3 | -0/+15 | |
| | | | | | | | | | | | | Fixes #146 | |||||
| * | | Use the mitm.it domain for the app, turn it on by default. | Aldo Cortesi | 2014-01-27 | 1 | -3/+3 | |
| | | | ||||||
| * | | Android doc update. | Aldo Cortesi | 2014-01-27 | 1 | -2/+5 | |
| | | | ||||||
| * | | Revert "Move the doc tree out into its own repo." | Aldo Cortesi | 2014-01-27 | 91 | -0/+5706 | |
| | | | | | | | | | | | | This reverts commit 8f88fcedd601c0033b4469b66626a83011879baf. | |||||
| * | | Serve correct certs from app. Enable Windows and Android icons. | Aldo Cortesi | 2014-01-24 | 2 | -8/+8 | |
| |/ | ||||||
* | | unify ipv4/ipv6 address handling | Maximilian Hils | 2014-01-28 | 4 | -36/+28 | |
| | | ||||||
* | | merge master | Maximilian Hils | 2014-01-22 | 105 | -5769/+102 | |
|\| | ||||||
| * | travis: install netlib from git before installing requirements. | Aldo Cortesi | 2014-01-22 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-22 | 0 | -0/+0 | |
| |\ | | | | | | | | | | | | | Conflicts: doc-src/certinstall/android.html | |||||
| | * | Add note on emulated android devices. refs #204 | Maximilian Hils | 2014-01-21 | 1 | -2/+5 | |
| | | | ||||||
| * | | Move the doc tree out into its own repo. | Aldo Cortesi | 2014-01-22 | 92 | -5707/+1 | |
| |/ | ||||||
| * | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 8 | -20/+15 | |
| | | | | | | | | And pick up one bug as a consequence. | |||||
| * | Release test script and checklist. | Aldo Cortesi | 2014-01-19 | 2 | -0/+62 | |
| | | ||||||
| * | Doc and readme tweaks. | Aldo Cortesi | 2014-01-19 | 6 | -20/+37 | |
| | | ||||||
| * | Refactor docs to define nav sidebar in only one place. | Aldo Cortesi | 2014-01-19 | 4 | -95/+51 | |
| | | ||||||
| * | Tweak setup.py to allow installs outside source dir | Aldo Cortesi | 2014-01-19 | 2 | -2/+8 | |
| | | | | | | | | Also fix mitmdump version output | |||||
| * | Optionally take the mitmproxy path for doc rendering from a env variable. | Aldo Cortesi | 2014-01-19 | 1 | -1/+1 | |
| | | ||||||
| * | PyInstaller bug requiring a console import in mitmdump is gone | Aldo Cortesi | 2014-01-19 | 1 | -2/+1 | |
| | | ||||||
| * | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-19 | 15 | -24/+90 | |
| |\ | ||||||
| * | | Handle views that don't support search gracefully | Aldo Cortesi | 2014-01-19 | 1 | -3/+12 | |
| | | | | | | | | | | | | | | | This includes all key/value formatted views, e.g. the image view. We need to support these ultimately, but no time before the next release. | |||||
| * | | Re-enable caching on search. | Aldo Cortesi | 2014-01-19 | 1 | -10/+3 | |
| | | | ||||||
* | | | Add functionality to transparently proxify connections to other HTTPS proxies | Maximilian Hils | 2014-01-18 | 2 | -6/+37 | |
| | | | ||||||
* | | | merge master | Maximilian Hils | 2014-01-18 | 40 | -202/+2031 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | fix sni bug: respond with the correct certificate | Maximilian Hils | 2014-01-16 | 1 | -5/+5 | |
| | | | ||||||
| * | | fix syntax highlighting for countershape urls by using different quotes | Maximilian Hils | 2014-01-14 | 6 | -16/+16 | |
| | | | ||||||
| * | | add tutorial for transparent proxying, other minor docs improvements | Maximilian Hils | 2014-01-14 | 10 | -9/+75 | |
| |/ | ||||||
| * | Deprecate Flow.unload_script in favor of Flow.unload_scripts | Aldo Cortesi | 2014-01-13 | 2 | -9/+12 | |
| | | | | | | | | | | In the presence of arguments, unloading a single script is clumsy and less useful. | |||||
| * | Extract command parsing and use in script grid editor | Aldo Cortesi | 2014-01-13 | 3 | -13/+19 | |
| | | ||||||
| * | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 9 | -54/+49 | |
| | | ||||||
| * | Clean up and clarify script API | Aldo Cortesi | 2014-01-12 | 4 | -30/+17 | |
| | | ||||||
| * | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 6 | -86/+83 | |
| | | | | | | | | | | - Move ScriptContext into script module - Use mock module instead of hand-rolled mock objects in tests | |||||
| * | ignore console test utilities on windows | Maximilian Hils | 2014-01-10 | 1 | -2/+3 | |
| | | ||||||
| * | display build status from master branch | Maximilian Hils | 2014-01-09 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #199 from dwilbraham/add_protobuffer_content_type | Maximilian Hils | 2014-01-06 | 1 | -1/+4 | |
| |\ | | | | | | | Decode content as protobuf if the content_type is "application/x-protobuffer" | |||||
| | * | Update ViewProtobuf in contentview.py to also decode as protobuf if the ↵ | Dan Wilbraham | 2014-01-05 | 1 | -1/+4 | |
| |/ | | | | | | | content_type is "application/x-protobuffer" | |||||
| * | Tweaking web stub app, icons for certificates, serve PEM correctly. | Aldo Cortesi | 2014-01-05 | 11 | -7/+1779 | |
| | | ||||||
| * | Remove / binding alias for limit | Aldo Cortesi | 2014-01-05 | 1 | -2/+1 | |
| | | | | | | | | The search and limit functionality is too different. |