Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Use the contextmanager in all tests | Shadab Zafar | 2016-03-11 | 2 | -44/+50 | |
| | | | | | | | ||||||
| * | | | | | | Add contextmanager to load an example | Shadab Zafar | 2016-03-11 | 1 | -10/+15 | |
| | | | | | | | ||||||
| * | | | | | | Add tests for redirect_requests example | Shadab Zafar | 2016-03-11 | 1 | -0/+7 | |
| | | | | | | | ||||||
| * | | | | | | Add test for iframe_injector example | Shadab Zafar | 2016-03-11 | 2 | -2/+17 | |
| | | | | | | | ||||||
| * | | | | | | Add tests for custom_contentviews example | Shadab Zafar | 2016-03-11 | 1 | -1/+9 | |
| | | | | | | | ||||||
| * | | | | | | Add tests for modify_response_body example | Shadab Zafar | 2016-03-11 | 1 | -0/+16 | |
| | | | | | | | ||||||
| * | | | | | | Remove missing import | Shadab Zafar | 2016-03-11 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | Update modify_querystring example & add test for it | Shadab Zafar | 2016-03-11 | 2 | -4/+9 | |
| | | | | | | | ||||||
| * | | | | | | Add tests for add_header example | Shadab Zafar | 2016-03-11 | 1 | -0/+7 | |
| | | | | | | | ||||||
| * | | | | | | Add tests for modify_form example | Shadab Zafar | 2016-03-11 | 1 | -1/+17 | |
| | | | | | | | ||||||
| * | | | | | | Update modify_form example to not use deprecated functions | Shadab Zafar | 2016-03-11 | 1 | -3/+3 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #1023 from adityadivekar03/issue981 | Maximilian Hils | 2016-03-11 | 5 | -5/+10 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Add mitmproxy icon for binaries | |||||
| * | | | | | | Add icon for binaries | Aditya | 2016-03-11 | 5 | -5/+10 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #1022 from dufferzafar/fix-1018 | Thomas Kriechbaumer | 2016-03-11 | 1 | -2/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix missing cookie import | |||||
| * | | | | | | Fix missing cookie import | Shadab Zafar | 2016-03-11 | 1 | -2/+2 | |
| | |_|_|_|/ | |/| | | | | ||||||
* | | | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-03-10 | 12 | -1046/+2150 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Merge pull request #1004 from gzzhanghao/vscroll | Maximilian Hils | 2016-03-10 | 11 | -1027/+2135 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | [web] VirtualScroll and AutoScroll helper | |||||
| | * | | | | [web] VirtualScroll and AutoScroll helper | Jason | 2016-03-10 | 11 | -1027/+2135 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1012 from gzzhanghao/router | Maximilian Hils | 2016-03-09 | 3 | -20/+14 | |
| |\ \ \ \ | | | | | | | | | | | | | [web] eliminate common.Router.getParams | |||||
| | * | | | | [web] eliminate common.Router.getParams | Jason | 2016-03-09 | 3 | -20/+14 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #1015 from gzzhanghao/props | Maximilian Hils | 2016-03-09 | 2 | -4/+6 | |
| |\ \ \ \ | | | | | | | | | | | | | [web] dont mutate props | |||||
| | * | | | | [web] dont mutate props | Jason | 2016-03-09 | 2 | -4/+6 | |
| | | | | | | ||||||
* | | | | | | fix content view example inline script | Maximilian Hils | 2016-03-10 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1013 from gzzhanghao/style | Maximilian Hils | 2016-03-09 | 2 | -0/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | [web] Fix label margin in footer | |||||
| * | | | | [web] fix footer label margin | Jason | 2016-03-09 | 2 | -0/+7 | |
| |/ / / | ||||||
* | | | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-03-08 | 19 | -226/+395 | |
|\| | | | ||||||
| * | | | Merge pull request #1009 from gzzhanghao/settings | Maximilian Hils | 2016-03-07 | 5 | -104/+84 | |
| |\ \ \ | | | | | | | | | | | [web] eliminate SettingsState | |||||
| | * | | | [web] uniform code style for Footer component | Jason | 2016-03-08 | 2 | -11/+12 | |
| | | | | | ||||||
| | * | | | [web] eliminate SettingsState | Jason | 2016-03-07 | 5 | -104/+83 | |
| |/ / / | ||||||
| * | | | Merge pull request #994 from gzzhanghao/common | Maximilian Hils | 2016-03-05 | 6 | -45/+32 | |
| |\ \ \ | | |/ / | |/| | | [web] remove common.ChildFocus | |||||
| | * | | [web] remove common.ChildFocus | Jason | 2016-03-02 | 6 | -45/+32 | |
| | | | | ||||||
| * | | | Merge pull request #969 from dufferzafar/pretty-export | Thomas Kriechbaumer | 2016-03-04 | 2 | -3/+56 | |
| |\ \ \ | | | | | | | | | | | Indent JSON body while exporting it as code | |||||
| | * | | | Add a test for json request | Shadab Zafar | 2016-03-04 | 1 | -0/+31 | |
| | | | | | ||||||
| | * | | | Use separators param in json.dumps() to avoid trailing whitespace | Shadab Zafar | 2016-03-04 | 1 | -1/+3 | |
| | | | | | ||||||
| | * | | | Handle the case of correct json content-type but malformed body | Shadab Zafar | 2016-03-04 | 1 | -4/+9 | |
| | | | | | ||||||
| | * | | | Use json instead of contentviews | Shadab Zafar | 2016-03-03 | 1 | -9/+12 | |
| | | | | | ||||||
| | * | | | Use requests' json parameter | Shadab Zafar | 2016-03-01 | 1 | -18/+12 | |
| | | | | | ||||||
| | * | | | Indent JSON body while exporting it as code | Shadab Zafar | 2016-03-01 | 1 | -2/+20 | |
| | | | | | | | | | | | | | | | | | | | | Fixes #968 | |||||
| * | | | | Merge pull request #989 from dufferzafar/har-extractor | Thomas Kriechbaumer | 2016-03-04 | 4 | -75/+179 | |
| |\ \ \ \ | | | | | | | | | | | | | Improve HAR Extractor Script | |||||
| | * | | | | Use custom Context object | Shadab Zafar | 2016-03-04 | 1 | -6/+6 | |
| | | | | | | ||||||
| | * | | | | Test har_extractor.response | Shadab Zafar | 2016-03-04 | 2 | -0/+105 | |
| | | | | | | ||||||
| | * | | | | Fix pprint import | Shadab Zafar | 2016-03-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Use default empty page_list | Shadab Zafar | 2016-03-04 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Add basic test for har_extractor | Shadab Zafar | 2016-03-04 | 2 | -0/+10 | |
| | | | | | | ||||||
| | * | | | | Remove some duplication and make more pythonic har_extractor | Shadab Zafar | 2016-03-02 | 1 | -81/+59 | |
| | | | | | | ||||||
| | * | | | | Fixup HAR Extractor | Shadab Zafar | 2016-03-01 | 1 | -9/+20 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #988 from xhy940801/master | Thomas Kriechbaumer | 2016-03-04 | 6 | -1/+46 | |
| |\ \ \ \ | | | |_|/ | | |/| | | Add upstream proxy authentication | |||||
| | * | | | Improve test case | yonder | 2016-03-04 | 2 | -1/+5 | |
| | | | | | ||||||
| | * | | | Add test for upstream-auth | yonder | 2016-03-02 | 4 | -3/+23 | |
| | | | | | ||||||
| | * | | | Add upstream proxy authentication | yonder | 2016-03-01 | 4 | -1/+22 | |
| | | | | |