Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove refresh_flow mechanism in favor of a signal-based implementation | Aldo Cortesi | 2015-03-22 | 3 | -41/+43 |
| | |||||
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-03-22 | 5 | -13/+107 |
|\ | |||||
| * | web: raw content view | Maximilian Hils | 2015-03-22 | 5 | -13/+107 |
| | | |||||
* | | console: observe state objects for changes, fire event to update status bar. | Aldo Cortesi | 2015-03-22 | 3 | -0/+16 |
|/ | |||||
* | Simplify the way in which path prompts keep state | Aldo Cortesi | 2015-03-22 | 7 | -26/+16 |
| | | | | | | In the past, we kept the last path the user specified for a number of different path types to pre-seed the path prompt. Now, we no longer distinguish between types, and pre-seed with the last used directory regardless. | ||||
* | Rationalise prompt calling conventions | Aldo Cortesi | 2015-03-22 | 7 | -52/+46 |
| | |||||
* | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2015-03-22 | 26 | -994/+1378 |
|\ | |||||
| * | tweak css | Maximilian Hils | 2015-03-22 | 10 | -157/+170 |
| | | |||||
| * | web: add content views | Maximilian Hils | 2015-03-22 | 7 | -47/+366 |
| | | |||||
| * | structure components | Maximilian Hils | 2015-03-21 | 9 | -831/+877 |
| | | |||||
| * | web: fix bugs | Maximilian Hils | 2015-03-21 | 7 | -13/+19 |
| | | |||||
* | | Refactor status bar prompting to use signal system | Aldo Cortesi | 2015-03-22 | 9 | -335/+386 |
| | | |||||
* | | Status bar message expiry based on signals and Urwid main loop | Aldo Cortesi | 2015-03-21 | 4 | -9/+23 |
|/ | |||||
* | Add blinker dependency, start using it to refactor console app | Aldo Cortesi | 2015-03-21 | 9 | -52/+51 |
| | | | | | Blinker lets us set up a central pub/sub mechanism to disentangle our object structure. | ||||
* | Add window.py import missed in refactoring | Aldo Cortesi | 2015-03-20 | 1 | -0/+1 |
| | |||||
* | console: pull primary window frame management out into window.py | Aldo Cortesi | 2015-03-20 | 3 | -148/+157 |
| | |||||
* | Pull console StatusBar into its own file. | Aldo Cortesi | 2015-03-20 | 2 | -182/+187 |
| | |||||
* | Remove cruft to work around an old Urwid bug | Aldo Cortesi | 2015-03-20 | 1 | -5/+0 |
| | |||||
* | Fix general prompt input. | Aldo Cortesi | 2015-03-20 | 2 | -0/+11 |
| | |||||
* | Pull PathEdit out into its own file. | Aldo Cortesi | 2015-03-20 | 4 | -110/+119 |
| | |||||
* | Explicitly handle keyboard interrupt in mitmproxy | Aldo Cortesi | 2015-03-20 | 1 | -10/+13 |
| | | | | Fixes #522 | ||||
* | Fix crashes on mouse click when input is being handled | Aldo Cortesi | 2015-03-20 | 1 | -3/+1 |
| | |||||
* | onboarding app: serve certs inline to unbreak firefox | Maximilian Hils | 2015-03-19 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-03-19 | 8 | -196/+294 |
|\ | |||||
| * | Nicer Solarized palettes, using the correct terminal values | Aldo Cortesi | 2015-03-19 | 2 | -71/+74 |
| | | |||||
| * | Reinstate solarized_dark and solarized_light palettes. | Aldo Cortesi | 2015-03-19 | 1 | -93/+93 |
| | | |||||
| * | Less painful light heading bar palette | Aldo Cortesi | 2015-03-19 | 1 | -2/+7 |
| | | | | | | | | lowlight remains painful due to background color restrictions. | ||||
| * | No output to stdout in the test suite, please. | Aldo Cortesi | 2015-03-19 | 1 | -3/+4 |
| | | |||||
| * | Revamp palette specification | Aldo Cortesi | 2015-03-19 | 4 | -190/+271 |
| | | | | | | | | | | | | | | - Split low-color and high-color specifications in palettes. - Split off light, dark, lowlight and lowdark palettes. Lowlight and lowdark will be the low-color base for most subsequent palettes. - Add a small script that makes test pattern requests to pathod. | ||||
| * | Merge pull request #526 from tekii/fix-522 | Aldo Cortesi | 2015-03-19 | 3 | -3/+11 |
| |\ | | | | | | | fix for #522 | ||||
| | * | test/test_console_help.py fixed | Marcelo Glezer | 2015-03-18 | 1 | -1/+9 |
| | | | |||||
| | * | fix for #522 | Marcelo Glezer | 2015-03-18 | 2 | -2/+2 |
| |/ | |||||
* / | fix webapp on Windows | Maximilian Hils | 2015-03-19 | 1 | -16/+20 |
|/ | | | | | - the p12 file needs a ".p12" extension. simply naming the file "p12" isn't sufficient | ||||
* | require urwid 1.3 | Maximilian Hils | 2015-03-18 | 1 | -1/+1 |
| | |||||
* | Merge pull request #523 from tekii/fix-client-replay-key | Maximilian Hils | 2015-03-17 | 1 | -1/+1 |
|\ | | | | | fixes crash pressing 'c':client-replay in mitmproxy | ||||
| * | fixes crash pressing 'c':client-replay in mitmproxy | Marcelo Glezer | 2015-03-17 | 1 | -1/+1 |
|/ | |||||
* | add table sort | Maximilian Hils | 2015-03-17 | 8 | -109/+395 |
| | |||||
* | web: smaller changes | Maximilian Hils | 2015-03-15 | 9 | -106/+65 |
| | |||||
* | Merge remote-tracking branch 'onlywade/master' | Maximilian Hils | 2015-03-15 | 6 | -28/+63 |
|\ | | | | | | | | | | | Conflicts: libmproxy/console/__init__.py libmproxy/console/flowlist.py | ||||
| * | Adding a server replay option to ignore host when searching for matching ↵ | Wade Catron | 2015-03-08 | 6 | -28/+65 |
| | | | | | | | | requests | ||||
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-03-15 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge pull request #519 from legendtang/master | Maximilian Hils | 2015-03-15 | 1 | -1/+1 |
| |\ \ | | | | | | | | | update package.json during transition period, see #518 | ||||
| | * | | update package.json during transition period, see #518 | Legend Tang | 2015-03-15 | 1 | -1/+1 |
| |/ / | |||||
* | | | mitmdump: improve request printing | Maximilian Hils | 2015-03-15 | 1 | -9/+14 |
| | | | |||||
* | | | mitmdump: decode flow before printing | Maximilian Hils | 2015-03-15 | 1 | -48/+40 |
|/ / | |||||
* | | Merge pull request #517 from mitmproxy/virtualenv-win | Maximilian Hils | 2015-03-14 | 3 | -13/+19 |
|\ \ | | | | | | | simplify virtualenv | ||||
| * | | ./dev: echo what we have done | Maximilian Hils | 2015-03-14 | 2 | -2/+12 |
| | | | |||||
| * | | Update README.mkd | Maximilian Hils | 2015-03-14 | 1 | -2/+2 |
| | | | |||||
| * | | simplify virtualenv | Maximilian Hils | 2015-03-14 | 3 | -12/+8 |
|/ / | | | | | | | | | | | | | | | - add dev.bat for Windows users - remove ~/.pipcache creation. If that causes issues with PyInstaller, we should use pip --no-cache-dir there or rm -r pip.locations.USER_CACHE_DIR. - remove superfluous pip install calls. | ||||
* | | travis: fix coveralls | Maximilian Hils | 2015-03-14 | 1 | -0/+2 |
| | |