Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix #459 | Maximilian Hils | 2015-02-05 | 2 | -6/+10 |
| | |||||
* | clean up flow reading | Maximilian Hils | 2015-02-05 | 1 | -25/+20 |
| | |||||
* | Merge remote-tracking branch 'tekii/master' | Maximilian Hils | 2015-02-05 | 1 | -4/+6 |
|\ | |||||
| * | open flow files using with as max suggested | Marcelo Glezer | 2015-01-12 | 1 | -2/+2 |
| | | |||||
| * | Merge remote-tracking branch 'base/master' | Marcelo Glezer | 2015-01-12 | 1 | -4/+12 |
| |\ | |||||
| * | | now mitmproxy supports multiple saved flows files too. also fixed ↵ | Marcelo Glezer | 2015-01-06 | 1 | -5/+7 |
| | | | | | | | | | | | | server_play_back start with mitmproxy (missing parameter) | ||||
* | | | fix statusbar initialization | Maximilian Hils | 2015-02-05 | 1 | -0/+2 |
| | | | |||||
* | | | missing parameter in start_server_playback call | Marcelo Glezer | 2015-01-13 | 1 | -2/+4 |
| | | | |||||
* | | | hotfix to mitmproxy missing start_server_playback() parameter added. ↵ | Marcelo Glezer | 2015-01-12 | 1 | -1/+1 |
| |/ |/| | | | | | backported from PR [#439] | ||||
* | | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Maximilian Hils | 2015-01-09 | 1 | -2/+10 |
|\ \ | |||||
| * | | Error to stdout when loading bad replays from the command line | Nick HS | 2015-01-08 | 1 | -2/+10 |
| |/ | |||||
* / | fix #443 | Maximilian Hils | 2015-01-09 | 1 | -2/+2 |
|/ | |||||
* | Consolidate reading flows from file, use in mitmweb. | Aldo Cortesi | 2015-01-02 | 1 | -15/+15 |
| | |||||
* | fix #435 | Maximilian Hils | 2014-12-29 | 1 | -0/+4 |
| | |||||
* | fix mitmproxy -w | Maximilian Hils | 2014-12-29 | 2 | -7/+7 |
| | |||||
* | web: CSP, revert functionality, serve content | Maximilian Hils | 2014-12-25 | 2 | -2/+0 |
| | |||||
* | fix gzipped body edit | Maximilian Hils | 2014-12-23 | 1 | -15/+20 |
| | |||||
* | web: intercept feature | Maximilian Hils | 2014-12-23 | 4 | -9/+9 |
| | |||||
* | Merge pull request #414 from mitmproxy/flowviews2 | Aldo Cortesi | 2014-12-12 | 1 | -4/+4 |
|\ | | | | | Flowviews2 | ||||
| * | introduce revised views, port over changes from multiple_views branch | Maximilian Hils | 2014-11-26 | 1 | -4/+4 |
| | | |||||
* | | fix HTTPResponse creation | Maximilian Hils | 2014-12-04 | 1 | -2/+1 |
| | | |||||
* | | fix #413 | Maximilian Hils | 2014-11-28 | 1 | -3/+4 |
|/ | |||||
* | always show error messages | Maximilian Hils | 2014-11-15 | 1 | -1/+1 |
| | |||||
* | fix grideditor bug | Maximilian Hils | 2014-11-14 | 1 | -0/+2 |
| | |||||
* | fix clear key | Maximilian Hils | 2014-11-10 | 1 | -4/+5 |
| | |||||
* | Using uppercase C to 'clear' display mode, because lowercase 'c' is used for css | Lucas Cimon | 2014-11-07 | 1 | -6/+5 |
| | |||||
* | fix #399 | Maximilian Hils | 2014-11-06 | 2 | -3/+6 |
| | |||||
* | Reduce loop timeouts to improve mitmproxy responsiveness | Aldo Cortesi | 2014-11-06 | 1 | -1/+1 |
| | | | | Fixes #384 | ||||
* | add generic tcp proxying, fix #374 | Maximilian Hils | 2014-10-18 | 3 | -9/+26 |
| | |||||
* | fix timestamp formatting: end_time may not be set | Maximilian Hils | 2014-09-22 | 1 | -1/+4 |
| | |||||
* | web: display flow connection info | Maximilian Hils | 2014-09-19 | 1 | -1/+1 |
| | |||||
* | fix #361 | Maximilian Hils | 2014-09-18 | 1 | -6/+3 |
| | |||||
* | fix flow detail display | Maximilian Hils | 2014-09-16 | 1 | -1/+1 |
| | |||||
* | fix missing timeout parameter | Maximilian Hils | 2014-09-14 | 1 | -1/+1 |
| | |||||
* | Remove external app option, make tick timeout explicit | Aldo Cortesi | 2014-09-14 | 1 | -1/+1 |
| | |||||
* | remove proxy mode abstraction: always be clear which mode we are in | Maximilian Hils | 2014-09-08 | 1 | -4/+3 |
| | |||||
* | document --ignore, fix #350 | Maximilian Hils | 2014-09-08 | 1 | -1/+2 |
| | |||||
* | add --ignore ui indication | Maximilian Hils | 2014-09-08 | 2 | -0/+28 |
| | |||||
* | fix #349 | Maximilian Hils | 2014-09-07 | 1 | -4/+12 |
| | |||||
* | update docs, mostly revert 2f44b26b4cd014e03dd62a125d79af9b81663a93 | Maximilian Hils | 2014-09-05 | 1 | -7/+7 |
| | |||||
* | Merge branch 'issue_341' into server_change_api | Maximilian Hils | 2014-09-04 | 1 | -0/+2 |
|\ | |||||
| * | Merge branch 'master' into issue_341 | Maximilian Hils | 2014-09-04 | 1 | -0/+2 |
| |\ | |||||
| | * | Add urwid stop prior to stack trace so exceptions are not cleared from screen | deployable | 2014-09-04 | 1 | -0/+2 |
| | | | |||||
* | | | Merge branch 'issue_341' into server_change_api | Maximilian Hils | 2014-09-04 | 2 | -6/+5 |
|\| | | | | | | | | | | | | | | | | | Conflicts: examples/redirect_requests.py libmproxy/console/common.py | ||||
| * | | fix some leftovers | Maximilian Hils | 2014-09-04 | 2 | -6/+5 |
| | | | |||||
* | | | improve HTTPRequest syntax | Maximilian Hils | 2014-09-03 | 2 | -10/+12 |
|/ / | |||||
* / | fix #341 - work on flows instead of request/response internally. | Maximilian Hils | 2014-09-03 | 1 | -13/+13 |
|/ | |||||
* | ui: display * instead of 0.0.0.0 for the bound address | Maximilian Hils | 2014-09-03 | 1 | -1/+4 |
| | |||||
* | add status bar indicator for streaming | Maximilian Hils | 2014-07-25 | 1 | -0/+2 |
| | |||||
* | workaround: always make sure that flow.response.reply exists | Maximilian Hils | 2014-07-25 | 2 | -2/+2 |
| |