Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1022 from dufferzafar/fix-1018 | Thomas Kriechbaumer | 2016-03-11 | 1 | -2/+2 |
|\ | |||||
| * | Fix missing cookie import | Shadab Zafar | 2016-03-11 | 1 | -2/+2 |
* | | [web] VirtualScroll and AutoScroll helper | Jason | 2016-03-10 | 2 | -652/+1716 |
* | | Merge pull request #1012 from gzzhanghao/router | Maximilian Hils | 2016-03-09 | 1 | -10/+7 |
|\ \ | |||||
| * | | [web] eliminate common.Router.getParams | Jason | 2016-03-09 | 1 | -10/+7 |
| |/ | |||||
* | | Merge pull request #1015 from gzzhanghao/props | Maximilian Hils | 2016-03-09 | 1 | -2/+3 |
|\ \ | |||||
| * | | [web] dont mutate props | Jason | 2016-03-09 | 1 | -2/+3 |
| |/ | |||||
* / | [web] fix footer label margin | Jason | 2016-03-09 | 1 | -0/+3 |
|/ | |||||
* | [web] uniform code style for Footer component | Jason | 2016-03-08 | 1 | -6/+5 |
* | [web] eliminate SettingsState | Jason | 2016-03-07 | 1 | -58/+48 |
* | Merge pull request #994 from gzzhanghao/common | Maximilian Hils | 2016-03-05 | 1 | -24/+17 |
|\ | |||||
| * | [web] remove common.ChildFocus | Jason | 2016-03-02 | 1 | -24/+17 |
* | | Merge pull request #969 from dufferzafar/pretty-export | Thomas Kriechbaumer | 2016-03-04 | 1 | -3/+25 |
|\ \ | |||||
| * | | 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 |
* | | | Merge pull request #988 from xhy940801/master | Thomas Kriechbaumer | 2016-03-04 | 4 | -1/+31 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Improve test case | yonder | 2016-03-04 | 1 | -1/+1 |
| * | | Add test for upstream-auth | yonder | 2016-03-02 | 2 | -3/+12 |
| * | | Add upstream proxy authentication | yonder | 2016-03-01 | 4 | -1/+22 |
* | | | [web] StoreView.index -> indexOf | Jason | 2016-03-02 | 2 | -2246/+2246 |
* | | | [web] fix StoreView.index | Jason | 2016-03-02 | 1 | -1/+1 |
| |/ |/| | |||||
* | | web: use es6 modules | Maximilian Hils | 2016-02-29 | 1 | -639/+842 |
* | | web: fix router | Maximilian Hils | 2016-02-29 | 2 | -120/+150 |
* | | fix up web stuff | Maximilian Hils | 2016-02-28 | 5 | -17478/+21700 |
|/ | |||||
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-27 | 1 | -12/+12 |
|\ | |||||
| * | fix h2 imports | Thomas Kriechbaumer | 2016-02-23 | 1 | -12/+12 |
* | | add simplified connection constructor | Maximilian Hils | 2016-02-27 | 1 | -2/+26 |
* | | fix #966 | Maximilian Hils | 2016-02-27 | 1 | -3/+2 |
|/ | |||||
* | fix proxy reconnect | Maximilian Hils | 2016-02-20 | 1 | -1/+1 |
* | fix tests | Thomas Kriechbaumer | 2016-02-20 | 1 | -1/+1 |
* | fix #951 | Maximilian Hils | 2016-02-19 | 1 | -9/+15 |
* | console: slightly less hacky hack show http2 warning after first tick | Aldo Cortesi | 2016-02-19 | 1 | -7/+8 |
* | enable HTTP/2 by default if available | Thomas Kriechbaumer | 2016-02-18 | 4 | -17/+26 |
* | combine projects | Maximilian Hils | 2016-02-18 | 126 | -191/+0 |
* | move mitmproxy/web to root | Maximilian Hils | 2016-02-18 | 66 | -8841/+0 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-18 | 140 | -8189/+28 |
|\ | |||||
| * | Merge pull request #959 from thiagoarrais/doc-fix | Aldo Cortesi | 2016-02-18 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix help | Thiago Arrais | 2016-02-17 | 1 | -1/+1 |
| * | | Merge branch 'h2' of https://github.com/Kriechi/mitmproxy into Kriechi-h2 | Aldo Cortesi | 2016-02-18 | 2 | -16/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | upgrade h2, remove reset-stream hotfix | Thomas Kriechbaumer | 2016-02-17 | 2 | -16/+1 |
| * | | Pull bin to the top, move pathod examples to examples dir | Aldo Cortesi | 2016-02-18 | 3 | -10/+0 |
| * | | Merge remote-tracking branch 'origin/unify' | Aldo Cortesi | 2016-02-18 | 1 | -2/+0 |
| |\ \ | |||||
| | * | | add combined MANIFEST.in and CHANGELOG | Maximilian Hils | 2016-02-17 | 2 | -477/+0 |
| | |/ | |||||
| * | | Docs and examples to top level | Aldo Cortesi | 2016-02-18 | 134 | -7689/+0 |
| * | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2016-02-18 | 2 | -6/+26 |
| |\ \ | |||||
| | * | | Add a content view for query parameters | Will Coster | 2016-02-16 | 2 | -6/+26 |
| | |/ | |||||
| * / | One CHANGELOG at the top of the repo | Aldo Cortesi | 2016-02-18 | 1 | -475/+0 |
| |/ |