aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* commands: add a parser for partial commandsAldo Cortesi2017-12-152-0/+35
* commands: add a Cmd argument typeAldo Cortesi2017-12-158-20/+35
* Introduce a custom widget for command editingAldo Cortesi2017-12-155-11/+126
* Merge pull request #2674 from mhils/issue-2620Aldo Cortesi2017-12-151-9/+10
|\
| * fix #2620Maximilian Hils2017-12-141-9/+10
* | Merge pull request #2545 from mitmproxy/wsprotoAldo Cortesi2017-12-1518-119/+1708
|\ \
| * | vendoring of wsprotoThomas Kriechbaumer2017-12-127-4/+1419
| * | docs++: add websocket PING/PONGThomas Kriechbaumer2017-12-121-0/+5
| * | docs++: add individual protocol pagesThomas Kriechbaumer2017-12-127-7/+63
| * | Use wsproto for websocketsUjjwal Verma2017-12-125-109/+185
| * | prepare WebSocket stack to move to wsprotoThomas Kriechbaumer2017-12-122-117/+154
* | | Merge pull request #2675 from mhils/issue-2673Aldo Cortesi2017-12-152-8/+12
|\ \ \
| * | | fix #2673Maximilian Hils2017-12-142-8/+12
|/ / /
* | | Merge pull request #2671 from mhils/command-argtypesMaximilian Hils2017-12-145-58/+59
|\ \ \
| * | | simplify path typeMaximilian Hils2017-12-141-6/+3
| * | | adjust testsMaximilian Hils2017-12-141-8/+16
| * | | introduce @command.argumentMaximilian Hils2017-12-144-44/+40
| | |/ | |/|
* / | fix keybinding help stringsMaximilian Hils2017-12-141-2/+2
|/ /
* | Merge pull request #2669 from cortesi/pathAldo Cortesi2017-12-148-17/+31
|\ \
| * | commands: add a Path argument typeAldo Cortesi2017-12-138-17/+31
* | | Merge pull request #2670 from Kriechi/fix-2664Maximilian Hils2017-12-131-1/+8
|\ \ \
| * | | fix #2664Thomas Kriechbaumer2017-12-131-1/+8
| | |/ | |/|
* | | Merge pull request #2668 from cortesi/commandoptsAldo Cortesi2017-12-138-38/+109
|\ \ \ | | |/ | |/|
| * | commands: formalise a Choice typeAldo Cortesi2017-12-137-25/+79
| * | console: refactor console.flowview.modeAldo Cortesi2017-12-122-13/+27
| * | minor: clarify docs for command.edit.focus*Aldo Cortesi2017-12-121-1/+4
* | | Merge pull request #2643 from Ga-ryo/masterMaximilian Hils2017-12-122-0/+5
|\ \ \ | |_|/ |/| |
| * | minor improvements, add tests for ipv4-mapped addressesMaximilian Hils2017-12-123-4/+5
| * | Fix #2594@Ga_ryo_2017-12-121-0/+4
* | | fix #2529Maximilian Hils2017-12-122-2/+13
* | | fix #2651Maximilian Hils2017-12-121-2/+2
* | | Merge pull request #2662 from mhils/pathod-connect-hostAldo Cortesi2017-12-121-0/+1
|\ \ \
| * | | add host header to pathoc's CONNECT requestsMaximilian Hils2017-12-111-0/+1
* | | | Merge pull request #2661 from mhils/browser-winAldo Cortesi2017-12-122-10/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'master' into browser-winAldo Cortesi2017-12-123-2/+18
| |\ \ \ | |/ / / |/| | |
* | | | [requires.io] dependency update on master branch (#2637)Thomas Kriechbaumer2017-12-111-2/+2
| |/ / |/| |
* | | commands: verify command function signatures before call (#2659)Aldo Cortesi2017-12-112-0/+16
| * | fix browser addon on WindowsMaximilian Hils2017-12-112-10/+33
|/ /
* | Merge pull request #2656 from cortesi/browseraddonAldo Cortesi2017-12-114-1/+86
|\ \ | |/ |/|
| * browser addon: start an isolated browser attached to the proxyAldo Cortesi2017-12-104-1/+86
|/
* Bug in expected_http_body_size fix (#2642)Suraj Tripathi2017-11-272-1/+16
* Fix #2635, mitmdump does not apply filter to saved data. (#2636)Matthew Shao2017-11-221-1/+1
* Merge pull request #2621 from mhils/clientreplayMaximilian Hils2017-11-166-14/+35
|\
| * improve clientreplay addonMaximilian Hils2017-11-073-14/+22
| * fix revert of duplicated flowsMaximilian Hils2017-11-063-0/+13
* | [requires.io] dependency update on master branch (#2629)Thomas Kriechbaumer2017-11-151-1/+1
* | Merge pull request #2626 from mitmproxy/requires-io-masterThomas Kriechbaumer2017-11-111-1/+1
|\ \
| * | [requires.io] dependency updaterequires.io2017-11-101-1/+1
|/ /
* / [requires.io] dependency update on master branch (#2623)Thomas Kriechbaumer2017-11-101-1/+1
|/
* Merge pull request #2619 from mhils/issue-2617Maximilian Hils2017-11-062-18/+16
|\