aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove superfluous set_focusMaximilian Hils2015-04-261-2/+0
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-264-113/+91
|\
| * Merge pull request #561 from tunz/overwriteMaximilian Hils2015-04-231-2/+20
| |\
| | * Check overwrite, when save to file instaed of clipboardChoongwoo Han2015-04-231-2/+20
| |/
| * python2 -> python in ./devAldo Cortesi2015-04-211-2/+2
| * Missed some un-needed variable declarationsAldo Cortesi2015-04-211-3/+1
| * HTTP request reading moves to netlibAldo Cortesi2015-04-211-105/+64
| * Fudge a rare race condition in the test suiteAldo Cortesi2015-04-191-1/+4
* | fix #568Maximilian Hils2015-04-262-2/+3
|/
* console: make g/G shortcuts work in more contextsAldo Cortesi2015-04-173-2/+15
* console: more consistent view stack managementAldo Cortesi2015-04-171-40/+55
* console: suport unary attributesAldo Cortesi2015-04-173-28/+66
* console: refactor grideditor, fix a crash on tab for subeditorsAldo Cortesi2015-04-161-59/+52
* Adjust header key color in solarized palettesAldo Cortesi2015-04-161-2/+2
* console: first pass of a Set-cookie editor for responsesAldo Cortesi2015-04-163-66/+196
* console: add a -l flag to set the limit on startupAldo Cortesi2015-04-154-0/+16
* Adjust for ODict interface changeAldo Cortesi2015-04-153-4/+4
* Editor for request cookiesAldo Cortesi2015-04-152-21/+53
* Whitespace, formattingAldo Cortesi2015-04-151-23/+33
* Add set_cookies method to HTTPResponseAldo Cortesi2015-04-142-0/+30
* New get_cookies for HttpResponseAldo Cortesi2015-04-143-67/+70
* New get_cookie and set_cookie implementations for HTTPRequestAldo Cortesi2015-04-142-16/+31
* Update docs to reflect non-aliased odict moduleAldo Cortesi2015-04-141-4/+3
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-04-147-7/+79
|\
| * make dev script more robust, fix #556Maximilian Hils2015-04-132-2/+6
| * spaces, not tabsMaximilian Hils2015-04-122-5/+9
| * add flowwriter exampleMaximilian Hils2015-04-122-1/+18
| * add testsMaximilian Hils2015-04-101-0/+14
| * fix pretty_host if no host is presentMaximilian Hils2015-04-101-2/+4
| * fix #553Maximilian Hils2015-04-102-2/+33
* | Housekeeping and cleanupsAldo Cortesi2015-04-1412-93/+97
|/
* add yappi benchmark toolMaximilian Hils2015-04-082-0/+51252
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-04-0810-1464/+1283
|\
| * Merge pull request #544 from ryoqun/websocket-connection-header-case-sensitivityMaximilian Hils2015-04-081-1/+2
| |\
| | * Make the Websocket's connection header value case-insensitiveRyo Onodera2015-03-311-1/+2
| * | Merge pull request #547 from macmantrl/blank_valuesMaximilian Hils2015-04-082-6/+10
| |\ \
| | * | Keep blank query values for flow hashingTerry Long2015-04-022-6/+10
| * | | fix testsMaximilian Hils2015-04-081-0/+2
| * | | add example which uses filtMaximilian Hils2015-04-082-0/+16
| * | | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-0823-1754/+2009
| |\ \ \
| | * \ \ Merge pull request #543 from legendtang/masterMaximilian Hils2015-04-083-1451/+1247
| | |\ \ \
| | | * \ \ Merge https://github.com/mitmproxy/mitmproxyLegend Tang2015-04-0611-125/+369
| | | |\ \ \
| | | * | | | web: fix delete flowsLegend Tang2015-03-303-1451/+1247
| * | | | | | allow passing custom argv to libmproxy.mainMaximilian Hils2015-04-081-6/+6
| | |/ / / / | |/| | | |
* | | | | | Add an autoenv file to auto-activate the virtualenvAldo Cortesi2015-04-082-0/+9
| |/ / / / |/| | | |
* | | | | console: add g/G shortcuts throughoutAldo Cortesi2015-04-074-7/+18
* | | | | Refactor flow list state managementAldo Cortesi2015-04-077-48/+28
* | | | | consone: don't enter Options if it's already openAldo Cortesi2015-04-071-0/+3
* | | | | console: tune palettes a bitAldo Cortesi2015-04-071-6/+14
* | | | | console: toggle palette transparency from options, indicate selected paletteAldo Cortesi2015-04-071-2/+24