aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add method to group pairs by cookiesShadab Zafar2016-08-152-0/+51
* Add simple har_dump testShadab Zafar2016-08-151-25/+32
* Remove pages objectShadab Zafar2016-08-151-1/+0
* Remove harparser dependencyShadab Zafar2016-08-151-1/+0
* Welcome har_dumpShadab Zafar2016-08-151-0/+145
* Goodbye har_extractorShadab Zafar2016-08-151-264/+0
* style fixesThomas Kriechbaumer2016-08-141-3/+3
* Merge pull request #1441 from mitmproxy/integrate_mitmproxy_contentviewsMaximilian Hils2016-08-1319-758/+64352
|\
| * move content to redux, add lines to viewClemens2016-08-103-15/+35
| * fix css bugClemens2016-08-091-1/+1
| * merge with masterClemens2016-08-0978-2078/+659
| |\
| * | little changes in cssClemens2016-08-093-16/+18
| * | added hints from mhilsClemens2016-08-0910-697/+64007
| * | add sticky footer contentviewClemens2016-08-063-5/+6
| * | change some styleClemens2016-08-056-70/+121
| * | fix get contentview in mitmwebClemens2016-08-042-3/+5
| * | litte style changesClemens2016-08-033-3/+7
| * | integrate simplified contentviewsClemens2016-08-036-132/+137
| * | add view all button, add dropdown for contentviewsClemens2016-08-037-64/+213
| * | replace get_content_view in dumper and flowviewClemens2016-08-012-43/+7
| * | moved getlines to contentviewsClemens2016-07-292-32/+33
| * | combine clientside and serverside contentviewsClemens2016-07-296-73/+80
| * | add image to mitmproxy.contentview.imageClemens2016-07-283-5/+11
| * | mitmproxy.contentviews addedClemens2016-07-288-32/+81
| * | add contentviews to clientClemens2016-07-274-6/+26
| * | add parameter to content requestsClemens2016-07-272-2/+3
| * | add contentviews to settingsClemens2016-07-271-1/+4
* | | Merge pull request #1479 from Kriechi/fix-1430Maximilian Hils2016-08-132-13/+15
|\ \ \
| * | | fix #1430Thomas Kriechbaumer2016-08-132-13/+15
|/ / /
* | | update dependencies (#1478)Maximilian Hils2016-08-111-2/+2
* | | fix lxml binary linkMaximilian Hils2016-08-101-2/+2
* | | Merge pull request #1474 from mhils/reply-fixMaximilian Hils2016-08-1027-154/+319
|\ \ \
| * | | clean up code, improve DummyReplyMaximilian Hils2016-08-0921-74/+90
| * | | finalize Reply semantics, fix testsMaximilian Hils2016-08-0917-68/+183
| * | | make Reply.state readonlyMaximilian Hils2016-08-091-5/+19
| * | | improve reply semanticsMaximilian Hils2016-08-081-57/+57
| * | | fix reply concurrencyMaximilian Hils2016-08-041-2/+22
| | |/ | |/|
* / | allow tox workdir reconfiguration for ubuntu on windowsMaximilian Hils2016-08-092-1/+2
|/ /
* | fix testsMaximilian Hils2016-08-044-4/+2
* | minor improvementsMaximilian Hils2016-08-042-1/+2
* | simplify contentview logicMaximilian Hils2016-08-046-125/+127
* | Update install.rstMaximilian Hils2016-08-021-1/+1
* | fix #1465, fix ssl_insecureMaximilian Hils2016-08-023-8/+16
* | Revert "Add missing ssl_insecure option"Maximilian Hils2016-08-021-1/+0
* | Merge pull request #1463 from dufferzafar/options-hotfixThomas Kriechbaumer2016-08-021-0/+1
|\ \
| * | Add missing ssl_insecure optionShadab Zafar2016-08-021-0/+1
|/ /
* | Merge pull request #1457 from mkagenius/interger_divisionThomas Kriechbaumer2016-08-011-1/+1
|\ \
| * | integer division for python 3 compatibilityManish Kumar2016-08-011-1/+1
|/ /
* | Merge pull request #1453 from dufferzafar/limit-to-filterMaximilian Hils2016-07-319-37/+37
|\ \
| * | Rename "Limit" feature to "Filter View"Shadab Zafar2016-07-319-37/+37