aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Use the contextmanager in all testsShadab Zafar2016-03-112-44/+50
| | | | | | |
| * | | | | | Add contextmanager to load an exampleShadab Zafar2016-03-111-10/+15
| | | | | | |
| * | | | | | Add tests for redirect_requests exampleShadab Zafar2016-03-111-0/+7
| | | | | | |
| * | | | | | Add test for iframe_injector exampleShadab Zafar2016-03-112-2/+17
| | | | | | |
| * | | | | | Add tests for custom_contentviews exampleShadab Zafar2016-03-111-1/+9
| | | | | | |
| * | | | | | Add tests for modify_response_body exampleShadab Zafar2016-03-111-0/+16
| | | | | | |
| * | | | | | Remove missing importShadab Zafar2016-03-111-1/+0
| | | | | | |
| * | | | | | Update modify_querystring example & add test for itShadab Zafar2016-03-112-4/+9
| | | | | | |
| * | | | | | Add tests for add_header exampleShadab Zafar2016-03-111-0/+7
| | | | | | |
| * | | | | | Add tests for modify_form exampleShadab Zafar2016-03-111-1/+17
| | | | | | |
| * | | | | | Update modify_form example to not use deprecated functionsShadab Zafar2016-03-111-3/+3
| | | | | | |
* | | | | | | Merge pull request #1023 from adityadivekar03/issue981Maximilian Hils2016-03-115-5/+10
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Add mitmproxy icon for binaries
| * | | | | | Add icon for binariesAditya2016-03-115-5/+10
|/ / / / / /
* | | | | | Merge pull request #1022 from dufferzafar/fix-1018Thomas Kriechbaumer2016-03-111-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix missing cookie import
| * | | | | | Fix missing cookie importShadab Zafar2016-03-111-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-03-1012-1046/+2150
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #1004 from gzzhanghao/vscrollMaximilian Hils2016-03-1011-1027/+2135
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | [web] VirtualScroll and AutoScroll helper
| | * | | | [web] VirtualScroll and AutoScroll helperJason2016-03-1011-1027/+2135
| |/ / / /
| * | | | Merge pull request #1012 from gzzhanghao/routerMaximilian Hils2016-03-093-20/+14
| |\ \ \ \ | | | | | | | | | | | | [web] eliminate common.Router.getParams
| | * | | | [web] eliminate common.Router.getParamsJason2016-03-093-20/+14
| | |/ / /
| * | | | Merge pull request #1015 from gzzhanghao/propsMaximilian Hils2016-03-092-4/+6
| |\ \ \ \ | | | | | | | | | | | | [web] dont mutate props
| | * | | | [web] dont mutate propsJason2016-03-092-4/+6
| | | | | |
* | | | | | fix content view example inline scriptMaximilian Hils2016-03-101-1/+1
|/ / / / /
* | | | | Merge pull request #1013 from gzzhanghao/styleMaximilian Hils2016-03-092-0/+7
|\ \ \ \ \ | |/ / / / |/| | | | [web] Fix label margin in footer
| * | | | [web] fix footer label marginJason2016-03-092-0/+7
| |/ / /
* | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-03-0819-226/+395
|\| | |
| * | | Merge pull request #1009 from gzzhanghao/settingsMaximilian Hils2016-03-075-104/+84
| |\ \ \ | | | | | | | | | | [web] eliminate SettingsState
| | * | | [web] uniform code style for Footer componentJason2016-03-082-11/+12
| | | | |
| | * | | [web] eliminate SettingsStateJason2016-03-075-104/+83
| |/ / /
| * | | Merge pull request #994 from gzzhanghao/commonMaximilian Hils2016-03-056-45/+32
| |\ \ \ | | |/ / | |/| | [web] remove common.ChildFocus
| | * | [web] remove common.ChildFocusJason2016-03-026-45/+32
| | | |
| * | | Merge pull request #969 from dufferzafar/pretty-exportThomas Kriechbaumer2016-03-042-3/+56
| |\ \ \ | | | | | | | | | | Indent JSON body while exporting it as code
| | * | | Add a test for json requestShadab Zafar2016-03-041-0/+31
| | | | |
| | * | | Use separators param in json.dumps() to avoid trailing whitespaceShadab Zafar2016-03-041-1/+3
| | | | |
| | * | | Handle the case of correct json content-type but malformed bodyShadab Zafar2016-03-041-4/+9
| | | | |
| | * | | Use json instead of contentviewsShadab Zafar2016-03-031-9/+12
| | | | |
| | * | | Use requests' json parameterShadab Zafar2016-03-011-18/+12
| | | | |
| | * | | Indent JSON body while exporting it as codeShadab Zafar2016-03-011-2/+20
| | | | | | | | | | | | | | | | | | | | Fixes #968
| * | | | Merge pull request #989 from dufferzafar/har-extractorThomas Kriechbaumer2016-03-044-75/+179
| |\ \ \ \ | | | | | | | | | | | | Improve HAR Extractor Script
| | * | | | Use custom Context objectShadab Zafar2016-03-041-6/+6
| | | | | |
| | * | | | Test har_extractor.responseShadab Zafar2016-03-042-0/+105
| | | | | |
| | * | | | Fix pprint importShadab Zafar2016-03-041-1/+1
| | | | | |
| | * | | | Use default empty page_listShadab Zafar2016-03-041-2/+2
| | | | | |
| | * | | | Add basic test for har_extractorShadab Zafar2016-03-042-0/+10
| | | | | |
| | * | | | Remove some duplication and make more pythonic har_extractorShadab Zafar2016-03-021-81/+59
| | | | | |
| | * | | | Fixup HAR ExtractorShadab Zafar2016-03-011-9/+20
| | |/ / /
| * | | | Merge pull request #988 from xhy940801/masterThomas Kriechbaumer2016-03-046-1/+46
| |\ \ \ \ | | | |_|/ | | |/| | Add upstream proxy authentication
| | * | | Improve test caseyonder2016-03-042-1/+5
| | | | |
| | * | | Add test for upstream-authyonder2016-03-024-3/+23
| | | | |
| | * | | Add upstream proxy authenticationyonder2016-03-014-1/+22
| | | | |