| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
* | 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 |
|\ |
|
| * | 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 |
* | | Handle views that don't support search gracefully | Aldo Cortesi | 2014-01-19 | 1 | -3/+12 |
* | | Re-enable caching on search. | Aldo Cortesi | 2014-01-19 | 1 | -10/+3 |
|/ |
|
* | Deprecate Flow.unload_script in favor of Flow.unload_scripts | Aldo Cortesi | 2014-01-13 | 2 | -9/+12 |
* | 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 |
* | 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 |
|\ |
|
| * | Update ViewProtobuf in contentview.py to also decode as protobuf if the conte... | Dan Wilbraham | 2014-01-05 | 1 | -1/+4 |
|/ |
|
* | 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 |
* | Merge pull request #192 from mitmproxy/refactor_read_http_body | Aldo Cortesi | 2014-01-04 | 2 | -8/+18 |
|\ |
|
| * | move CONTINUE checks into mitmproxy | Maximilian Hils | 2013-12-15 | 2 | -8/+18 |
* | | Merge pull request #193 from droope/search-functionality | Aldo Cortesi | 2014-01-04 | 5 | -43/+353 |
|\ \ |
|
| * | | now really fix it + test | Pedro Worcel | 2013-12-26 | 2 | -6/+29 |
| * | | fix bug that happens after searching for a non-existant string, and | Pedro Worcel | 2013-12-26 | 1 | -1/+6 |
| * | | add docs | Pedro Worcel | 2013-12-26 | 1 | -1/+2 |
| * | | added 'n' functionality, tidy up & testing | Pedro Worcel | 2013-12-26 | 1 | -1/+9 |
| * | | add looping around | Pedro Worcel | 2013-12-26 | 2 | -53/+137 |
| * | | fix failing test | Pedro Worcel | 2013-12-25 | 1 | -1/+2 |
| * | | fix crash | root | 2013-12-25 | 1 | -2/+2 |
| * | | Add focusing, and fixes non-clearance of prev searches. Add | root | 2013-12-25 | 3 | -45/+139 |
| * | | test passing, UI still not working | root | 2013-12-24 | 4 | -6/+99 |
| * | | add search with / for compatibility with what I'll do. | root | 2013-12-23 | 1 | -1/+2 |
* | | | Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmprox... | Aldo Cortesi | 2014-01-05 | 4 | -8/+7 |
|\ \ \ |
|
| * | | | Update another reference to PIL. | Tomaz Muraus | 2014-01-04 | 1 | -1/+3 |
| * | | | Migrate from Pil to the latest version of Pillow. | Tomaz Muraus | 2014-01-03 | 3 | -8/+5 |
* | | | | Merge pull request #198 from Kami/add_css_view | Aldo Cortesi | 2014-01-04 | 5 | -2/+63 |
|\ \ \ \ |
|
| * | | | | Fix CSS view prompt, update display mode options. | Tomaz Muraus | 2014-01-04 | 2 | -1/+5 |
| * | | | | Provide more sensible serializer options. | Tomaz Muraus | 2014-01-04 | 1 | -0/+5 |
| * | | | | Add CSS view which beautifies CSS files if cssutils library is available, | Tomaz Muraus | 2014-01-04 | 4 | -2/+54 |
| |/ / / |
|
* | | | | Introduce file descriptor decorators for Request objects | Aldo Cortesi | 2014-01-05 | 3 | -18/+36 |
* | | | | Decouple message type from message class name. | Aldo Cortesi | 2014-01-04 | 3 | -20/+20 |
* | | | | Move app mechanism to flow.py | Aldo Cortesi | 2014-01-04 | 6 | -133/+137 |
* | | | | Merge branch 'master' of ssh.github.com:cortesi/mitmproxy | Aldo Cortesi | 2014-01-04 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | fix #195 | Maximilian Hils | 2014-01-03 | 1 | -1/+1 |
| |/ / / |
|
* / / / | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 6 | -80/+61 |
|/ / / |
|
* / / | list mock as requirement (via @droope) | Maximilian Hils | 2013-12-29 | 1 | -0/+1 |
|/ / |
|
* | | ignore web gui specific paths that won't get cleaned up when changing branches | Maximilian Hils | 2013-12-17 | 1 | -0/+2 |
* | | merge smurfix/fix2, add serverconnect hook docs, adjust tests | Maximilian Hils | 2013-12-16 | 9 | -21/+60 |
|\ \
| |/
|/| |
|