Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [web] eliminate common.Router.getParams | Jason | 2016-03-09 | 3 | -20/+14 |
| | |||||
* | 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 |
| | | | | |||||
* | | | | Merge pull request #993 from gzzhanghao/tests | Maximilian Hils | 2016-03-02 | 2 | -1/+5 |
|\ \ \ \ | |_|_|/ |/| | | | [web] Fix eslint warnings about tests | ||||
| * | | | [web] Fix eslint warnings about tests | Jason | 2016-03-02 | 2 | -1/+5 |
|/ / / | |||||
* | | | Merge pull request #992 from gzzhanghao/gulp | Maximilian Hils | 2016-03-02 | 1 | -0/+4 |
|\ \ \ | | | | | | | | | [web] gulp: log errors from buildScript/bundle | ||||
| * | | | [web] gulp: log errors from buildScript/bundle | Jason | 2016-03-02 | 1 | -0/+4 |
| | | | | |||||
* | | | | Merge pull request #991 from gzzhanghao/flowtable | Maximilian Hils | 2016-03-02 | 4 | -2250/+2250 |
|\ \ \ \ | |/ / / |/| | | | [web] fix FlowTable.scrollIntoView | ||||
| * | | | [web] StoreView.index -> indexOf | Jason | 2016-03-02 | 4 | -2250/+2250 |
|/ / / | |||||
* | | | Merge pull request #990 from gzzhanghao/index | Maximilian Hils | 2016-03-02 | 2 | -2/+2 |
|\ \ \ | |_|/ |/| | | [web] fix StoreView.index | ||||
| * | | [web] fix StoreView.index | Jason | 2016-03-02 | 2 | -2/+2 |
|/ / | |||||
* | | web: use es6 modules | Maximilian Hils | 2016-02-29 | 24 | -939/+1079 |
| | | |||||
* | | web: fix router | Maximilian Hils | 2016-02-29 | 11 | -215/+232 |
| | | |||||
* | | fix up web stuff | Maximilian Hils | 2016-02-28 | 27 | -18082/+22298 |
|/ | |||||
* | suppress pathoc test timeouts on windows | Maximilian Hils | 2016-02-27 | 1 | -0/+2 |
| | |||||
* | fix snapshot upload | Maximilian Hils | 2016-02-27 | 2 | -22/+25 |
| | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-27 | 5 | -17/+19 |
|\ | |||||
| * | Merge pull request #978 from Kriechi/dev-ci | Maximilian Hils | 2016-02-26 | 3 | -5/+6 |
| |\ | | | | | | | use dev-scripts on CI | ||||
| | * | use dev-scripts on CI | Thomas Kriechbaumer | 2016-02-25 | 3 | -5/+6 |
| |/ | |||||
| * | fix #977 | Thomas Kriechbaumer | 2016-02-24 | 1 | -1/+1 |
| | | |||||
| * | fix h2 imports | Thomas Kriechbaumer | 2016-02-23 | 1 | -12/+12 |
| | | | | | | | | fixes #975 | ||||
| * | Merge branch 'ParthGanatra-pip-upgrade' | Thomas Kriechbaumer | 2016-02-23 | 1 | -0/+1 |
| |\ | |||||
| | * | Update dev.sh | Parth Ganatra | 2016-02-23 | 1 | -0/+1 |
| | | | |||||
* | | | add simplified connection constructor | Maximilian Hils | 2016-02-27 | 1 | -2/+26 |
| | | | |||||
* | | | fix #966 | Maximilian Hils | 2016-02-27 | 1 | -3/+2 |
|/ / | |||||
* / | fix coverage collection | Maximilian Hils | 2016-02-23 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #967 from dufferzafar/766 | Aldo Cortesi | 2016-02-22 | 1 | -3/+3 |
|\ | | | | | Fix minor issues with har_extractor | ||||
| * | har_extractor: Replace deprecated stuff with recommended ones | Shadab Zafar | 2016-02-20 | 1 | -3/+3 |
| | |