aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1488 from mitmproxy/websocketsThomas Kriechbaumer2016-09-0124-489/+967
|\
| * cleanup testsThomas Kriechbaumer2016-09-014-3/+7
| * add docs for websocket_handshake hookThomas Kriechbaumer2016-09-011-0/+12
| * websockets: update protocol detectionThomas Kriechbaumer2016-09-016-59/+39
| * add websockets support to mitmproxyThomas Kriechbaumer2016-09-017-9/+465
| * websockets: refactor implementation and add testsThomas Kriechbaumer2016-09-019-473/+499
|/
* Merge pull request #1517 from cortesi/httperrsThomas Kriechbaumer2016-09-012-27/+39
|\
| * Improve the way we handle upstream errorsAldo Cortesi2016-09-012-27/+39
|/
* Adjust flowbasic example for Options API changesAldo Cortesi2016-09-011-11/+13
* Merge pull request #1511 from arjun23496/count_in_replaceThomas Kriechbaumer2016-08-316-9/+38
|\
| * Lint fix - minorarjun234962016-08-312-3/+2
| * Lint fix - replace testsarjun234962016-08-313-6/+9
| * Lint fix - netlib headersarjun234962016-08-311-4/+2
| * minor bug fix header replacearjun234962016-08-311-3/+7
| * Added tests for replace in request,message,headerarjun234962016-08-314-1/+25
| * Minor bug fix - messages.py replacearjun234962016-08-291-1/+1
| * Added replace for request and headers - Fixed missing replace optionarjun234962016-08-292-5/+6
| * Added count argument for replace for contents in bodyarjun234962016-08-261-2/+2
|/
* Merge pull request #1493 from dufferzafar/long-urlsThomas Kriechbaumer2016-08-262-10/+20
|\
| * Show full URL in flowviewShadab Zafar2016-08-231-4/+0
| * Use unicode elipsis & make extra params a part of dictShadab Zafar2016-08-232-16/+16
| * Use terminal width rather than a constantShadab Zafar2016-08-203-10/+12
| * Truncate URLs in consoleShadab Zafar2016-08-202-3/+15
* | Merge pull request #1510 from mkagenius/dividebyzeroThomas Kriechbaumer2016-08-262-0/+4
|\ \
| * | fixing lint errorManish Kumar2016-08-261-0/+1
| * | fixed : Divide by zero error came when string was empty, also a testManish Kumar2016-08-262-1/+4
|/ /
* | allow test classes to dynamically specify ssl contextThomas Kriechbaumer2016-08-241-1/+2
* | refactor httpThomas Kriechbaumer2016-08-241-7/+11
* | ignore all coverage temp filesThomas Kriechbaumer2016-08-241-1/+1
* | wrap long linesThomas Kriechbaumer2016-08-242-4/+24
* | bump h2 dependencyThomas Kriechbaumer2016-08-241-1/+1
* | fix #1504Maximilian Hils2016-08-231-0/+3
* | Merge pull request #1500 from mhils/simple-response-creationMaximilian Hils2016-08-235-15/+73
|\ \
| * | introduce Response.make for simple response creationMaximilian Hils2016-08-235-15/+73
|/ /
* | remove redundant propertyMaximilian Hils2016-08-221-4/+0
* | Merge pull request #1489 from mitmproxy/web_refactorMaximilian Hils2016-08-2218-4276/+1237
|\ \
| * | fix dropdown css, add new selection after deleteClemens2016-08-222-3/+10
| * | fix refactoring bugClemens2016-08-191-2/+2
| * | refactoringClemens2016-08-194-9/+7
| * | add static filesClemens2016-08-183-4053/+1006
| * | refactor contentviews, dropdown, filemenu and footerClemens2016-08-185-93/+83
| * | refactor dropdown menu, view selectorClemens2016-08-184-115/+103
| * | fix viewselector bugClemens2016-08-171-1/+1
| * | refactor codeeditorClemens2016-08-171-2/+1
| * | fix deselection on delete, fix toggleInputButton propsClemens2016-08-172-4/+7
| * | refactor flow menuClemens2016-08-161-1/+5
| * | refactor file up and downloadClemens2016-08-163-30/+49
| * | refactor header_optionsClemens2016-08-162-17/+17
* | | Merge pull request #1490 from mitmproxy/web_write_testsMaximilian Hils2016-08-214-13/+87
|\ \ \ | |_|/ |/| |
| * | added testsClemens2016-08-194-13/+87
|/ /