aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console
Commit message (Expand)AuthorAgeFilesLines
* merge flow classes. current status: basic mitmdump workingMaximilian Hils2014-01-301-1/+1
* Silence pyflakesAldo Cortesi2014-01-192-2/+2
* Handle views that don't support search gracefullyAldo Cortesi2014-01-191-3/+12
* Re-enable caching on search.Aldo Cortesi2014-01-191-10/+3
* Extract command parsing and use in script grid editorAldo Cortesi2014-01-131-5/+6
* Script refactoring: move script command parsing into script module.Aldo Cortesi2014-01-121-9/+9
* Clean up and clarify script APIAldo Cortesi2014-01-121-4/+6
* Start refactoring scriptsAldo Cortesi2014-01-121-1/+4
* Update ViewProtobuf in contentview.py to also decode as protobuf if the conte...Dan Wilbraham2014-01-051-1/+4
* Remove / binding alias for limitAldo Cortesi2014-01-051-2/+1
* Merge pull request #193 from droope/search-functionalityAldo Cortesi2014-01-042-38/+231
|\
| * now really fix it + testPedro Worcel2013-12-261-5/+9
| * fix bug that happens after searching for a non-existant string, andPedro Worcel2013-12-261-1/+6
| * add docsPedro Worcel2013-12-261-1/+2
| * added 'n' functionality, tidy up & testingPedro Worcel2013-12-261-1/+9
| * add looping aroundPedro Worcel2013-12-261-53/+116
| * fix crashroot2013-12-251-2/+2
| * Add focusing, and fixes non-clearance of prev searches. Addroot2013-12-251-33/+75
| * test passing, UI still not workingroot2013-12-241-5/+74
| * add search with / for compatibility with what I'll do.root2013-12-231-1/+2
* | Merge branch 'migrate_from_pil_to_pillow' of https://github.com/Kami/mitmprox...Aldo Cortesi2014-01-051-5/+2
|\ \
| * | Migrate from Pil to the latest version of Pillow.Tomaz Muraus2014-01-031-5/+2
| |/
* | Merge pull request #198 from Kami/add_css_viewAldo Cortesi2014-01-042-1/+35
|\ \
| * | Fix CSS view prompt, update display mode options.Tomaz Muraus2014-01-042-1/+5
| * | Provide more sensible serializer options.Tomaz Muraus2014-01-041-0/+5
| * | Add CSS view which beautifies CSS files if cssutils library is available,Tomaz Muraus2014-01-041-1/+26
| |/
* | Merge branch 'master' of ssh.github.com:cortesi/mitmproxyAldo Cortesi2014-01-041-1/+1
|\ \
| * | fix #195Maximilian Hils2014-01-031-1/+1
| |/
* / Fix app in mitmproxy console, update to bootstrap 3.Aldo Cortesi2014-01-032-17/+32
|/
* Small workaround to make mitmproxy work again.Aldo Cortesi2013-12-091-2/+2
* Merge branch 'master' into 0.10Maximilian Hils2013-12-081-1/+1
|\
| * Merge pull request #134 from mhils/scripts_improvementsAldo Cortesi2013-12-081-1/+1
| |\
| * | Fix divide by zero issue when timestamp start and end are the sameRich Somerfield2013-11-261-1/+1
* | | Merge pull request #161 from mitmproxy/external_webappAldo Cortesi2013-12-081-1/+1
|\ \ \
| * | | add option to expose webapp externally, remove distinct ip settingMaximilian Hils2013-08-181-1/+1
* | | | Merge branch 'master' into 0.10Maximilian Hils2013-09-141-1/+9
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Tweak timing displayAldo Cortesi2013-08-232-7/+4
| * | console: Add support for displaying transfer rateKyle Manna2013-08-131-0/+3
| * | console: Add support for displaying elapsed timeKyle Manna2013-08-132-1/+9
* | | Merge branch 'master' into 0.10Maximilian Hils2013-08-178-153/+41
|\| |
| * | Remove GPL notices left in source files after our change to the MIT license.Aldo Cortesi2013-08-018-120/+0
| * | Show an error when attempting to decode invalid data.Aldo Cortesi2013-07-291-1/+2
| * | Repair minor user interface issue that caused brief flashes of duplicate flow...Aldo Cortesi2013-07-291-0/+2
| * | Fix startup with no state.Aldo Cortesi2013-07-281-1/+4
| * | Some refactoring of the console inteface.Aldo Cortesi2013-07-284-33/+29
| * | Move app instantiation out of proxy.py.Aldo Cortesi2013-07-241-0/+6
* | | Merge remote-tracking branch 'origin/scripts_improvements' into 0.10Maximilian Hils2013-06-161-1/+1
|\ \ \ | |/ / |/| / | |/
| * add support for multiple scripts and script arguments. refs #76Maximilian Hils2013-06-131-1/+1
* | always read files in binary modeMaximilian Hils2013-06-162-3/+3
|/
* Massage content-type before sending it to mime detectionAldo Cortesi2013-06-091-0/+1