aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1480 from mhils/reverse-proxy-authThomas Kriechbaumer2016-08-164-13/+55
|\
| * add basic auth support for reverse proxy modeMaximilian Hils2016-08-134-13/+55
* | Merge pull request #1483 from gzzhanghao/historyMaximilian Hils2016-08-155-47/+63
|\ \
| * | [web] bug fixJason2016-08-161-5/+6
| * | [web] fix testRegexJason2016-08-151-1/+1
| * | [web] remove react-routerJason2016-08-155-46/+61
| |/
* | Merge pull request #1464 from dufferzafar/harThomas Kriechbaumer2016-08-156-307/+410
|\ \
| * | Remove timezone specific valueShadab Zafar2016-08-151-1/+1
| * | Use test times less than 2038Shadab Zafar2016-08-152-5/+5
| * | Assert cookie groups explicitly rather than just the lengthShadab Zafar2016-08-151-16/+40
| * | Add a test for base64 encodingShadab Zafar2016-08-151-5/+18
| * | Fix issue with binary content in jsonShadab Zafar2016-08-151-2/+3
| * | Use postData field in PUT, PATCH requests tooShadab Zafar2016-08-151-1/+1
| * | Refactor format_cookiesShadab Zafar2016-08-151-6/+6
| * | Add some cookie formatting related testsShadab Zafar2016-08-152-5/+25
| * | Support .zhar compressionShadab Zafar2016-08-151-2/+5
| * | Add text field to response contentShadab Zafar2016-08-151-2/+11
| * | Add serverIPAddress fieldShadab Zafar2016-08-151-0/+3
| * | Add postData fieldShadab Zafar2016-08-151-2/+11
| * | Add SSL & Connect timingsShadab Zafar2016-08-151-6/+22
| * | Add a ctx.log on finishShadab Zafar2016-08-151-2/+4
| * | Open JSON file in text modeShadab Zafar2016-08-152-2/+2
| * | Simplify name_valueShadab Zafar2016-08-151-11/+1
| * | Fix wrong importShadab Zafar2016-08-151-1/+1
| * | Improve cookies formattingShadab Zafar2016-08-151-4/+19
| * | Simplify cookies.is_expiredShadab Zafar2016-08-151-16/+7
| * | Add a function to get cookie expiration timeShadab Zafar2016-08-152-0/+46
| * | Format Cookies according to the HAR SpecShadab Zafar2016-08-151-5/+29
| * | 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