aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1022 from dufferzafar/fix-1018Thomas Kriechbaumer2016-03-111-2/+2
|\
| * Fix missing cookie importShadab Zafar2016-03-111-2/+2
* | [web] VirtualScroll and AutoScroll helperJason2016-03-102-652/+1716
* | Merge pull request #1012 from gzzhanghao/routerMaximilian Hils2016-03-091-10/+7
|\ \
| * | [web] eliminate common.Router.getParamsJason2016-03-091-10/+7
| |/
* | Merge pull request #1015 from gzzhanghao/propsMaximilian Hils2016-03-091-2/+3
|\ \
| * | [web] dont mutate propsJason2016-03-091-2/+3
| |/
* / [web] fix footer label marginJason2016-03-091-0/+3
|/
* [web] uniform code style for Footer componentJason2016-03-081-6/+5
* [web] eliminate SettingsStateJason2016-03-071-58/+48
* Merge pull request #994 from gzzhanghao/commonMaximilian Hils2016-03-051-24/+17
|\
| * [web] remove common.ChildFocusJason2016-03-021-24/+17
* | Merge pull request #969 from dufferzafar/pretty-exportThomas Kriechbaumer2016-03-041-3/+25
|\ \
| * | 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
* | | Merge pull request #988 from xhy940801/masterThomas Kriechbaumer2016-03-044-1/+31
|\ \ \ | |_|/ |/| |
| * | Improve test caseyonder2016-03-041-1/+1
| * | Add test for upstream-authyonder2016-03-022-3/+12
| * | Add upstream proxy authenticationyonder2016-03-014-1/+22
* | | [web] StoreView.index -> indexOfJason2016-03-022-2246/+2246
* | | [web] fix StoreView.indexJason2016-03-021-1/+1
| |/ |/|
* | web: use es6 modulesMaximilian Hils2016-02-291-639/+842
* | web: fix routerMaximilian Hils2016-02-292-120/+150
* | fix up web stuffMaximilian Hils2016-02-285-17478/+21700
|/
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-271-12/+12
|\
| * fix h2 importsThomas Kriechbaumer2016-02-231-12/+12
* | add simplified connection constructorMaximilian Hils2016-02-271-2/+26
* | fix #966Maximilian Hils2016-02-271-3/+2
|/
* fix proxy reconnectMaximilian Hils2016-02-201-1/+1
* fix testsThomas Kriechbaumer2016-02-201-1/+1
* fix #951Maximilian Hils2016-02-191-9/+15
* console: slightly less hacky hack show http2 warning after first tickAldo Cortesi2016-02-191-7/+8
* enable HTTP/2 by default if availableThomas Kriechbaumer2016-02-184-17/+26
* combine projectsMaximilian Hils2016-02-18126-191/+0
* move mitmproxy/web to rootMaximilian Hils2016-02-1866-8841/+0
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-18140-8189/+28
|\
| * Merge pull request #959 from thiagoarrais/doc-fixAldo Cortesi2016-02-181-1/+1
| |\
| | * Fix helpThiago Arrais2016-02-171-1/+1
| * | Merge branch 'h2' of https://github.com/Kriechi/mitmproxy into Kriechi-h2Aldo Cortesi2016-02-182-16/+1
| |\ \ | | |/ | |/|
| | * upgrade h2, remove reset-stream hotfixThomas Kriechbaumer2016-02-172-16/+1
| * | Pull bin to the top, move pathod examples to examples dirAldo Cortesi2016-02-183-10/+0
| * | Merge remote-tracking branch 'origin/unify'Aldo Cortesi2016-02-181-2/+0
| |\ \
| | * | add combined MANIFEST.in and CHANGELOGMaximilian Hils2016-02-172-477/+0
| | |/
| * | Docs and examples to top levelAldo Cortesi2016-02-18134-7689/+0
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2016-02-182-6/+26
| |\ \
| | * | Add a content view for query parametersWill Coster2016-02-162-6/+26
| | |/
| * / One CHANGELOG at the top of the repoAldo Cortesi2016-02-181-475/+0
| |/