aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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
| | | |
* | | | Merge pull request #993 from gzzhanghao/testsMaximilian Hils2016-03-022-1/+5
|\ \ \ \ | |_|_|/ |/| | | [web] Fix eslint warnings about tests
| * | | [web] Fix eslint warnings about testsJason2016-03-022-1/+5
|/ / /
* | | Merge pull request #992 from gzzhanghao/gulpMaximilian Hils2016-03-021-0/+4
|\ \ \ | | | | | | | | [web] gulp: log errors from buildScript/bundle
| * | | [web] gulp: log errors from buildScript/bundleJason2016-03-021-0/+4
| | | |
* | | | Merge pull request #991 from gzzhanghao/flowtableMaximilian Hils2016-03-024-2250/+2250
|\ \ \ \ | |/ / / |/| | | [web] fix FlowTable.scrollIntoView
| * | | [web] StoreView.index -> indexOfJason2016-03-024-2250/+2250
|/ / /
* | | Merge pull request #990 from gzzhanghao/indexMaximilian Hils2016-03-022-2/+2
|\ \ \ | |_|/ |/| | [web] fix StoreView.index
| * | [web] fix StoreView.indexJason2016-03-022-2/+2
|/ /
* | web: use es6 modulesMaximilian Hils2016-02-2924-939/+1079
| |
* | web: fix routerMaximilian Hils2016-02-2911-215/+232
| |
* | fix up web stuffMaximilian Hils2016-02-2827-18082/+22298
|/
* suppress pathoc test timeouts on windowsMaximilian Hils2016-02-271-0/+2
|
* fix snapshot uploadMaximilian Hils2016-02-272-22/+25
|
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-275-17/+19
|\
| * Merge pull request #978 from Kriechi/dev-ciMaximilian Hils2016-02-263-5/+6
| |\ | | | | | | use dev-scripts on CI
| | * use dev-scripts on CIThomas Kriechbaumer2016-02-253-5/+6
| |/
| * fix #977Thomas Kriechbaumer2016-02-241-1/+1
| |
| * fix h2 importsThomas Kriechbaumer2016-02-231-12/+12
| | | | | | | | fixes #975
| * Merge branch 'ParthGanatra-pip-upgrade'Thomas Kriechbaumer2016-02-231-0/+1
| |\
| | * Update dev.shParth Ganatra2016-02-231-0/+1
| | |
* | | add simplified connection constructorMaximilian Hils2016-02-271-2/+26
| | |
* | | fix #966Maximilian Hils2016-02-271-3/+2
|/ /
* / fix coverage collectionMaximilian Hils2016-02-231-2/+2
|/
* Merge pull request #967 from dufferzafar/766Aldo Cortesi2016-02-221-3/+3
|\ | | | | Fix minor issues with har_extractor
| * har_extractor: Replace deprecated stuff with recommended onesShadab Zafar2016-02-201-3/+3
| |
| * har_extractor: Use items() instead of iteritems()Shadab Zafar2016-02-201-2/+2
| |
* | Doc tweaksAldo Cortesi2016-02-215-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does the following: - Fixes all warnings in the doc tree - Adds a modd + devd conf file that renders HTML and treats doc warnings as errors. This lets you send warning output to your desktop notifier, and gives livereload similar to the livehtml entry in the Makefile. - Some small tweaks Sphinx currently has a bug that causes unknown options to generate a warning: https://github.com/sphinx-doc/sphinx/issues/2229 This is fixed in stable, but not yet released. You can update Sphinx to the latest stable like so: pip install --upgrade https://github.com/sphinx-doc/sphinx/archive/stable.zip
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyAldo Cortesi2016-02-212-2/+2
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-25 10:34:09 +0000