aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | 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-076-17/+56
| * | | | 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
| * | | | console: scripts to new options screenAldo Cortesi2015-04-064-10/+14
| * | | | console: replacement patterns to new option screenAldo Cortesi2015-04-063-10/+16
| * | | | console: ignore patterns to new options screen.Aldo Cortesi2015-04-064-15/+17
| * | | | Add headings to options, start migrating more options into options screenAldo Cortesi2015-04-063-32/+86
| * | | | Minimal help context for optionsAldo Cortesi2015-04-032-5/+14
| | |/ / | |/| |
| * | | console: tune and re-enable palettesAldo Cortesi2015-04-031-20/+26
| * | | Don't list all options shortcuts in helpAldo Cortesi2015-04-031-26/+1
| | |/ | |/|
| * | console: C to clear all options, correct footer in options screenAldo Cortesi2015-04-032-4/+28
| * | console: keyboard shortcuts for optionsAldo Cortesi2015-04-033-15/+43
| * | console: basic options pageAldo Cortesi2015-04-034-37/+188
| * | console: fix a crash that sometimes occurs when setting a limitAldo Cortesi2015-04-011-0/+2
| * | Next/previous tab keybindingsAldo Cortesi2015-04-012-1/+5
| * | console: improve handling of help contexts, fix key bindings in flow viewsAldo Cortesi2015-04-015-37/+36
| * | console: fix body scrollingAldo Cortesi2015-03-312-1/+2
| * | Fix timestamps in detail viewAldo Cortesi2015-03-312-16/+70
| |/
* / allow passing custom argv to libmproxy.mainMaximilian Hils2015-04-081-6/+6
|/
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-301-85/+95
|\
| * Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-03-304-18/+18
| |\
| * | Disable keystrokes requiring a request/response on details pageAldo Cortesi2015-03-301-85/+95
* | | web: add prompt for keyboard navigationMaximilian Hils2015-03-3014-132/+599
| |/ |/|
* | s/filter/search/Maximilian Hils2015-03-304-18/+18
|/
* Update statusbar when flow list is cleared.Aldo Cortesi2015-03-301-0/+1
* Add flow detail view as a tab in the flow viewAldo Cortesi2015-03-295-111/+95
* console: add a tabs widget, and use it for flowview.Aldo Cortesi2015-03-293-79/+87
* Simplify content generation in flow viewAldo Cortesi2015-03-291-64/+40
* console: simplify view modes.Aldo Cortesi2015-03-291-20/+15
* Seems more natural to re-prompt for search every timeAldo Cortesi2015-03-291-1/+1
* Keep record of last search termAldo Cortesi2015-03-293-6/+11
* Zap old search testsAldo Cortesi2015-03-291-178/+0
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-03-298-44/+130
|\
| * web: add more keyboard shortcutsMaximilian Hils2015-03-295-21921/+110