| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | 1 | -53/+116 | |
| | | | ||||||
| | * | fix crash | root | 2013-12-25 | 1 | -2/+2 | |
| | | | ||||||
| | * | Add focusing, and fixes non-clearance of prev searches. Add | root | 2013-12-25 | 1 | -33/+75 | |
| | | | | | | | | | documentation. | |||||
| | * | test passing, UI still not working | root | 2013-12-24 | 1 | -5/+74 | |
| | | | ||||||
| | * | 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 ↵ | Aldo Cortesi | 2014-01-05 | 1 | -5/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | | | https://github.com/Kami/mitmproxy into Kami-migrate_from_pil_to_pillow Conflicts: requirements.txt | |||||
| | * | | Migrate from Pil to the latest version of Pillow. | Tomaz Muraus | 2014-01-03 | 1 | -5/+2 | |
| | |/ | ||||||
| * | | Merge pull request #198 from Kami/add_css_view | Aldo Cortesi | 2014-01-04 | 2 | -1/+35 | |
| |\ \ | | | | | | | Add CSS view which beautifies minified CSS files | |||||
| | * | | 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 | 1 | -1/+26 | |
| | |/ | | | | | | | otherwise it acts as a no-op. | |||||
| * | | 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 | |
| | |/ | | | | | (untested) | |||||
| * / | Fix app in mitmproxy console, update to bootstrap 3. | Aldo Cortesi | 2014-01-03 | 2 | -17/+32 | |
| |/ | ||||||
| * | Small workaround to make mitmproxy work again. | Aldo Cortesi | 2013-12-09 | 1 | -2/+2 | |
| | | | | | Further work is required to make scripts work again, though. | |||||
| * | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-12-08 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge pull request #134 from mhils/scripts_improvements | Aldo Cortesi | 2013-12-08 | 1 | -1/+1 | |
| | |\ | | | | | | | Support multiple scripts and script arguments. refs #76 | |||||
| | * | | Fix divide by zero issue when timestamp start and end are the same | Rich Somerfield | 2013-11-26 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge pull request #161 from mitmproxy/external_webapp | Aldo Cortesi | 2013-12-08 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | External webapp | |||||
| | * | | | add option to expose webapp externally, remove distinct ip setting | Maximilian Hils | 2013-08-18 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-09-14 | 1 | -1/+9 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | ||||||
| | * | | Tweak timing display | Aldo Cortesi | 2013-08-23 | 2 | -7/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove elapsed time. Space is at a premium here, and this is somewhat redundant with the rate figure. We should display complete timing information somewhere in the detailed flow view. - Tone down the colour. Reserve highlights for stuff that should really pop out to the user. - Make rate calculation more acurate. Include header sizes. Use response start and end time, rather than request end and response end. This means that we show actual transfer rates, not including DNS requests and so forth. | |||||
| | * | | console: Add support for displaying transfer rate | Kyle Manna | 2013-08-13 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | * Display the rate in the the response row. * Very handy for passive performance analysis. | |||||
| | * | | console: Add support for displaying elapsed time | Kyle Manna | 2013-08-13 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | * Display the elapsed time in the the response row. * Very handy for passive performance analysis. | |||||
| * | | | Merge branch 'master' into 0.10 | Maximilian Hils | 2013-08-17 | 8 | -153/+41 | |
| |\| | | ||||||
| | * | | Remove GPL notices left in source files after our change to the MIT license. | Aldo Cortesi | 2013-08-01 | 8 | -120/+0 | |
| | | | | | | | | | | | | | Thanks to Roy Shamir for reporting this. | |||||
| | * | | Show an error when attempting to decode invalid data. | Aldo Cortesi | 2013-07-29 | 1 | -1/+2 | |
| | | | | ||||||
| | * | | Repair minor user interface issue that caused brief flashes of duplicate ↵ | Aldo Cortesi | 2013-07-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | | flows in the flow list. | |||||
| | * | | Fix startup with no state. | Aldo Cortesi | 2013-07-28 | 1 | -1/+4 | |
| | | | | | | | | | | | | | Bug introduced in previous patch. | |||||
| | * | | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 4 | -33/+29 | |
| | | | | | | | | | | | | | | | | | | | Reduce some state duplication, by removing currentflow variable. Fixes #141 | |||||
| | * | | Move app instantiation out of proxy.py. | Aldo Cortesi | 2013-07-24 | 1 | -0/+6 | |
| | | | | ||||||
| * | | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10 | Maximilian Hils | 2013-06-16 | 1 | -1/+1 | |
| |\ \ \ | |/ / |/| / | |/ | ||||||
| | * | add support for multiple scripts and script arguments. refs #76 | Maximilian Hils | 2013-06-13 | 1 | -1/+1 | |
| | | | ||||||
| * | | always read files in binary mode | Maximilian Hils | 2013-06-16 | 2 | -3/+3 | |
| |/ | ||||||
| * | Massage content-type before sending it to mime detection | Aldo Cortesi | 2013-06-09 | 1 | -0/+1 | |
| | | | | | Fixes #67 | |||||
| * | Fix creation of new response when none existed before. | Aldo Cortesi | 2013-06-09 | 1 | -2/+7 | |
| | | | | | Fixes #133 | |||||
| * | Add error checking to ViewProtobuf | Jason A. Novak | 2013-04-21 | 1 | -2/+5 | |
| | | | | | | | | | There are protobufs that protoc can't parse. When protoc --decode_raw fails, it returns nothing to stdin, and writes "Failed to parse input." to stderr. Before this commit, if protoc --decode_raw couldn't parse the protobuf, the blank stdout output would get returned to the view; with this commit stderr gets caught and returned to the view. | |||||
| * | Merge pull request #112 from hamstah/protobuf-view | Aldo Cortesi | 2013-04-19 | 1 | -1/+36 | |
| |\ | | | | | Adds a new view for protocol buffers | |||||
| | * | Adds a new view for protocol buffers | Nicolas Esteves | 2013-04-06 | 1 | -1/+36 | |
| | | | | | | | | | | | | | | | | | | | The view uses protoc from the Google protocol buffer tools. If the tool isn't installed, the view isn't shown. Google protobuf repo: https://code.google.com/p/protobuf/ | |||||
| * | | Correct display mode highlight keys | Alexis Hildebrandt | 2013-04-16 | 3 | -3/+11 | |
| |/ | | | | | | Add html display mode to the help documentation. Correct html and hex display mode highlight keys (help used 'h' for hex). Correct json display mode highlight keys. | |||||
| * | Fix crash on intercept. | Aldo Cortesi | 2013-03-23 | 1 | -2/+2 | |
| | | | | | Fixes #106 | |||||
| * | Add the --host option, which uses the value in the Host header for dispaly URLs. | Aldo Cortesi | 2013-03-17 | 5 | -5/+18 | |
| | | | | | | - Can be toggled with "o" then "h" in mitmproxy - Useful for transparent mode | |||||
| * | Introduce a filtered flow writer, and use it in dump.py | Aldo Cortesi | 2013-03-14 | 1 | -1/+1 | |
| | | | | | Fixes #104 | |||||
| * | Remove __slots__ to make it possible to inherit from Options classes. | Aldo Cortesi | 2013-03-03 | 1 | -2/+2 | |
| | | ||||||
| * | Revert "show current filepath in status bar" | Aldo Cortesi | 2013-03-03 | 1 | -3/+0 | |
| | | | | | | | This reverts commit bf8367d6cf3e6b5b1e916453c9cf114194174a1a. This just doesn't work. We need a better solution, probably in the next release. | |||||
| * | Significantly refactor the master/slave message passing interface. | Aldo Cortesi | 2013-02-17 | 2 | -5/+5 | |
| | | ||||||
| * | Fixed a bug in format_flow in common.py. Changed the reference from ↵ | Chris Neasbitt | 2013-01-18 | 1 | -1/+1 | |
| | | | | | timestamp to timestamp_start. | |||||
| * | Merge pull request #82 from kanzure/show-filepath-in-statusbar | Aldo Cortesi | 2012-12-30 | 1 | -0/+3 | |
| |\ | | | | | Show current filepath in status bar | |||||
 |
index : cloud-email/mitmproxy | |
| clone of mitm proxy | James |
| aboutsummaryrefslogtreecommitdiffstats |