Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | web: fix react-router | Maximilian Hils | 2015-03-27 | 2 | -4/+8 |
| | |||||
* | Merge remote-tracking branch 'vzvu/react-router-0.13.2' | Maximilian Hils | 2015-03-27 | 3 | -7/+1 |
|\ | | | | | | | | | Conflicts: libmproxy/web/static/vendor.js | ||||
| * | web: upgrade to react-router 0.13.2 | vzvu3k6k | 2015-03-27 | 4 | -1430/+1754 |
| | | |||||
* | | web: initial attempt at header editor | Maximilian Hils | 2015-03-27 | 5 | -1039/+1591 |
|/ | |||||
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-03-26 | 9 | -28/+101 |
|\ | |||||
| * | Merge pull request #515 from krzysiekbielicki/master | Maximilian Hils | 2015-03-26 | 6 | -25/+89 |
| |\ | | | | | | | [#514] Add support for ignoring payload params in multipart/form-data | ||||
| | * | Added tests | Krzysztof Bielicki | 2015-03-16 | 2 | -1/+39 |
| | | | |||||
| | * | [#514] Add support for ignoring payload params in multipart/form-data | Krzysztof Bielicki | 2015-03-10 | 4 | -24/+50 |
| | | | |||||
| * | | Merge pull request #538 from peralta/patch-1 | Maximilian Hils | 2015-03-26 | 1 | -1/+4 |
| |\ \ | | | | | | | | | mitmweb: start onboarding app if instructed to | ||||
| | * | | mitmweb: start onboarding app if instructed to | peralta | 2015-03-26 | 1 | -1/+4 |
| |/ / | |||||
| * | | Merge pull request #537 from tekii/fix530 | Maximilian Hils | 2015-03-26 | 1 | -0/+2 |
| |\ \ | | | | | | | | | fix #530 set client_playback to None when client_playback is done | ||||
| | * | | fix #530 set client_playback to None when client_playback is done | Marcelo Glezer | 2015-03-25 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge pull request #536 from tekii/master | Maximilian Hils | 2015-03-26 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |/| | | fixed exception in mitmproxy -c fix #535 | ||||
| | * | | fix #535 server replay was failing from ui but working from command line ↵ | Marcelo Glezer | 2015-03-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | (fixed now too) | ||||
| | * | | fix #535 now works with both cases: using -c from command line and pressing ↵ | Marcelo Glezer | 2015-03-25 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | c in the ui | ||||
| | * | | fixed exception in mitmproxy -c fix #535 | Marcelo Glezer | 2015-03-25 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #532 from tekii/master | Maximilian Hils | 2015-03-25 | 1 | -1/+1 |
| |\ \ | | | | | | | | | handles UnicodeDecodeError (#531) | ||||
| | * | | handles UnicodeDecodeError | Marcelo Glezer | 2015-03-23 | 1 | -1/+1 |
| |/ / | |||||
* | | | web: backup flows on edit | Maximilian Hils | 2015-03-26 | 2 | -0/+11 |
| | | | |||||
* | | | web: add basic edit capability for first line | Maximilian Hils | 2015-03-23 | 12 | -133/+757 |
|/ / | |||||
* | | web: add content download | Maximilian Hils | 2015-03-22 | 4 | -5/+13 |
| | | |||||
* | | web: improve views | Maximilian Hils | 2015-03-22 | 7 | -47/+139 |
| | | |||||
* | | web: upgrade to react 0.13 | Maximilian Hils | 2015-03-22 | 6 | -4685/+6590 |
| | | |||||
* | | Unwind twisty maze of cache layers. Holy confusing, Batman. | Aldo Cortesi | 2015-03-22 | 1 | -35/+22 |
| | | |||||
* | | Replace far-too-clever decorator LRU cache with something simpler | Aldo Cortesi | 2015-03-22 | 5 | -66/+47 |
| | | |||||
* | | Whitespace, indentation, formatting | Aldo Cortesi | 2015-03-22 | 1 | -26/+102 |
| | | |||||
* | | Trigger flow change when flow elements are edited | Aldo Cortesi | 2015-03-22 | 1 | -2/+18 |
| | | |||||
* | | Fix unit tests | Aldo Cortesi | 2015-03-22 | 1 | -2/+2 |
| | | |||||
* | | console: signal-based view stack, unifying mechanisms for help, flow views, etc. | Aldo Cortesi | 2015-03-22 | 7 | -38/+35 |
| | | |||||
* | | console: refactor the way we keep global view state | Aldo Cortesi | 2015-03-22 | 5 | -66/+60 |
| | | |||||
* | | 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 |
| | |