aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replace far-too-clever decorator LRU cache with something simplerAldo Cortesi2015-03-225-66/+47
* Whitespace, indentation, formattingAldo Cortesi2015-03-221-26/+102
* Trigger flow change when flow elements are editedAldo Cortesi2015-03-221-2/+18
* Fix unit testsAldo Cortesi2015-03-221-2/+2
* console: signal-based view stack, unifying mechanisms for help, flow views, etc.Aldo Cortesi2015-03-227-38/+35
* console: refactor the way we keep global view stateAldo Cortesi2015-03-225-66/+60
* Remove refresh_flow mechanism in favor of a signal-based implementationAldo Cortesi2015-03-223-41/+43
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-03-225-13/+107
|\
| * web: raw content viewMaximilian Hils2015-03-225-13/+107
* | console: observe state objects for changes, fire event to update status bar.Aldo Cortesi2015-03-223-0/+16
|/
* Simplify the way in which path prompts keep stateAldo Cortesi2015-03-227-26/+16
* Rationalise prompt calling conventionsAldo Cortesi2015-03-227-52/+46
* Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2015-03-2226-994/+1378
|\
| * tweak cssMaximilian Hils2015-03-2210-157/+170
| * web: add content viewsMaximilian Hils2015-03-227-47/+366
| * structure componentsMaximilian Hils2015-03-219-831/+877
| * web: fix bugsMaximilian Hils2015-03-217-13/+19
* | Refactor status bar prompting to use signal systemAldo Cortesi2015-03-229-335/+386
* | Status bar message expiry based on signals and Urwid main loopAldo Cortesi2015-03-214-9/+23
|/
* Add blinker dependency, start using it to refactor console appAldo Cortesi2015-03-219-52/+51
* Add window.py import missed in refactoringAldo Cortesi2015-03-201-0/+1
* console: pull primary window frame management out into window.pyAldo Cortesi2015-03-203-148/+157
* Pull console StatusBar into its own file.Aldo Cortesi2015-03-202-182/+187
* Remove cruft to work around an old Urwid bugAldo Cortesi2015-03-201-5/+0
* Fix general prompt input.Aldo Cortesi2015-03-202-0/+11
* Pull PathEdit out into its own file.Aldo Cortesi2015-03-204-110/+119
* Explicitly handle keyboard interrupt in mitmproxyAldo Cortesi2015-03-201-10/+13
* Fix crashes on mouse click when input is being handledAldo Cortesi2015-03-201-3/+1
* onboarding app: serve certs inline to unbreak firefoxMaximilian Hils2015-03-191-2/+2
* Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-198-196/+294
|\
| * Nicer Solarized palettes, using the correct terminal valuesAldo Cortesi2015-03-192-71/+74
| * Reinstate solarized_dark and solarized_light palettes.Aldo Cortesi2015-03-191-93/+93
| * Less painful light heading bar paletteAldo Cortesi2015-03-191-2/+7
| * No output to stdout in the test suite, please.Aldo Cortesi2015-03-191-3/+4
| * Revamp palette specificationAldo Cortesi2015-03-194-190/+271
| * Merge pull request #526 from tekii/fix-522Aldo Cortesi2015-03-193-3/+11
| |\
| | * test/test_console_help.py fixedMarcelo Glezer2015-03-181-1/+9
| | * fix for #522Marcelo Glezer2015-03-182-2/+2
| |/
* / fix webapp on WindowsMaximilian Hils2015-03-191-16/+20
|/
* require urwid 1.3Maximilian Hils2015-03-181-1/+1
* Merge pull request #523 from tekii/fix-client-replay-keyMaximilian Hils2015-03-171-1/+1
|\
| * fixes crash pressing 'c':client-replay in mitmproxyMarcelo Glezer2015-03-171-1/+1
|/
* add table sortMaximilian Hils2015-03-178-109/+395
* web: smaller changesMaximilian Hils2015-03-159-106/+65
* Merge remote-tracking branch 'onlywade/master'Maximilian Hils2015-03-156-28/+63
|\
| * Adding a server replay option to ignore host when searching for matching requ...Wade Catron2015-03-086-28/+65
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyMaximilian Hils2015-03-151-1/+1
|\ \
| * \ Merge pull request #519 from legendtang/masterMaximilian Hils2015-03-151-1/+1
| |\ \
| | * | update package.json during transition period, see #518Legend Tang2015-03-151-1/+1
| |/ /
* | | mitmdump: improve request printingMaximilian Hils2015-03-151-9/+14