aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-05-023-1423/+1718
|\
| * web: try harder to fix editorMaximilian Hils2015-05-011-2/+7
| * Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-05-016-21/+11
| |\
| * | mitmweb: add editorMaximilian Hils2015-05-013-1423/+1713
* | | Adapt to new Pathoc API - silence output to stdout.Aldo Cortesi2015-05-021-2/+1
| |/ |/|
* | pretty_size now lives in netlib.utilsAldo Cortesi2015-04-306-21/+11
|/
* Merge pull request #569 from mike-pt/masterMaximilian Hils2015-04-272-4/+4
|\
| * + Use sys.platform.startswith("freebsd") instead of matching just freebsd10.Mike C2015-04-272-4/+4
* | make code more pythonicMaximilian Hils2015-04-261-8/+11
* | Merge remote-tracking branch 'tunz/crash1'Maximilian Hils2015-04-261-4/+11
|\ \
| * | Fix crash when save to clipboard before loadingChoongwoo Han2015-04-231-4/+11
* | | remove superfluous set_focusMaximilian Hils2015-04-261-2/+0
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-262-110/+85
|\ \ \ | | |/ | |/|
| * | Check overwrite, when save to file instaed of clipboardChoongwoo Han2015-04-231-2/+20
| |/
| * Missed some un-needed variable declarationsAldo Cortesi2015-04-211-3/+1
| * HTTP request reading moves to netlibAldo Cortesi2015-04-211-105/+64
* | 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
* Add set_cookies method to HTTPResponseAldo Cortesi2015-04-141-0/+19
* New get_cookies for HttpResponseAldo Cortesi2015-04-141-13/+14
* New get_cookie and set_cookie implementations for HTTPRequestAldo Cortesi2015-04-141-9/+16
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-04-141-4/+29
|\
| * fix pretty_host if no host is presentMaximilian Hils2015-04-101-2/+4
| * fix #553Maximilian Hils2015-04-101-2/+25
* | Housekeeping and cleanupsAldo Cortesi2015-04-144-22/+21
|/
* Merge pull request #547 from macmantrl/blank_valuesMaximilian Hils2015-04-081-1/+1
|\
| * Keep blank query values for flow hashingTerry Long2015-04-021-1/+1
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-04-0820-1746/+1999
|\ \
| * \ Merge pull request #543 from legendtang/masterMaximilian Hils2015-04-082-1450/+1246
| |\ \
| | * \ Merge https://github.com/mitmproxy/mitmproxyLegend Tang2015-04-0610-119/+363
| | |\ \
| | * | | web: fix delete flowsLegend Tang2015-03-302-1450/+1246
| * | | | 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
| * | | | console: All palettes now explicitly set a background colourAldo Cortesi2015-04-075-16/+53
| * | | | console: palette picker for the options screenAldo Cortesi2015-04-077-14/+120
| * | | | console: factor out selection widgetAldo Cortesi2015-04-062-130/+133
| * | | | console: sticky cookies and auth to options screenAldo Cortesi2015-04-064-20/+28
| * | | | console: TCP proxy patterns to new options screenAldo Cortesi2015-04-064-14/+17
| * | | | console: default display mode to new options screenAldo Cortesi2015-04-063-57/+14