| Commit message (Expand) | Author | Age | Files | Lines |
* | fix bugs, expose timestamp information to console ui | Maximilian Hils | 2014-02-06 | 2 | -14/+19 |
* | mock urwid to run console tests on windows, push failing testcases down to 0.... | Maximilian Hils | 2014-02-05 | 1 | -1/+1 |
* | fix all tests except those using set_url and get_url | Maximilian Hils | 2014-02-05 | 3 | -5/+5 |
* | merge flow classes. current status: basic mitmdump working | Maximilian Hils | 2014-01-30 | 1 | -1/+1 |
* | Silence pyflakes | Aldo Cortesi | 2014-01-19 | 2 | -2/+2 |
* | 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 |
* | Extract command parsing and use in script grid editor | Aldo Cortesi | 2014-01-13 | 1 | -5/+6 |
* | Script refactoring: move script command parsing into script module. | Aldo Cortesi | 2014-01-12 | 1 | -9/+9 |
* | Clean up and clarify script API | Aldo Cortesi | 2014-01-12 | 1 | -4/+6 |
* | Start refactoring scripts | Aldo Cortesi | 2014-01-12 | 1 | -1/+4 |
* | Update ViewProtobuf in contentview.py to also decode as protobuf if the conte... | Dan Wilbraham | 2014-01-05 | 1 | -1/+4 |
* | Remove / binding alias for limit | Aldo Cortesi | 2014-01-05 | 1 | -2/+1 |
* | Merge pull request #193 from droope/search-functionality | Aldo Cortesi | 2014-01-04 | 2 | -38/+231 |
|\ |
|
| * | now really fix it + test | Pedro Worcel | 2013-12-26 | 1 | -5/+9 |
| * | 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 | 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 |
| * | 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 https://github.com/Kami/mitmprox... | Aldo Cortesi | 2014-01-05 | 1 | -5/+2 |
|\ \ |
|
| * | | 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 |
|\ \ |
|
| * | | 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 |
| |/ |
|
* | | 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 | 2 | -17/+32 |
|/ |
|
* | Small workaround to make mitmproxy work again. | Aldo Cortesi | 2013-12-09 | 1 | -2/+2 |
* | 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 |
| |\ |
|
| * | | 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 |
|\ \ \ |
|
| * | | | 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 |
| * | | console: Add support for displaying transfer rate | Kyle Manna | 2013-08-13 | 1 | -0/+3 |
| * | | console: Add support for displaying elapsed time | Kyle Manna | 2013-08-13 | 2 | -1/+9 |
* | | | 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 |
| * | | 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 flow... | Aldo Cortesi | 2013-07-29 | 1 | -0/+2 |
| * | | Fix startup with no state. | Aldo Cortesi | 2013-07-28 | 1 | -1/+4 |
| * | | Some refactoring of the console inteface. | Aldo Cortesi | 2013-07-28 | 4 | -33/+29 |
| * | | 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 |
|\ \ \
| |/ /
|/| /
| |/ |
|