Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc tweaks | Aldo Cortesi | 2016-02-21 | 5 | -6/+11 |
* | Merge branch 'master' of github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2016-02-21 | 2 | -2/+2 |
|\ | |||||
| * | fix proxy reconnect | Maximilian Hils | 2016-02-20 | 1 | -1/+1 |
| * | fix tests | Thomas Kriechbaumer | 2016-02-20 | 1 | -1/+1 |
* | | First-order conversion of rtool to flat directory structure | Aldo Cortesi | 2016-02-19 | 1 | -80/+59 |
|/ | |||||
* | fix #951 | Maximilian Hils | 2016-02-19 | 1 | -9/+15 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-19 | 4 | -17/+27 |
|\ | |||||
| * | console: slightly less hacky hack show http2 warning after first tick | Aldo Cortesi | 2016-02-19 | 1 | -7/+8 |
| * | Merge pull request #960 from Kriechi/enable-h2 | Aldo Cortesi | 2016-02-19 | 4 | -17/+26 |
| |\ | |||||
| | * | enable HTTP/2 by default if available | Thomas Kriechbaumer | 2016-02-18 | 4 | -17/+26 |
* | | | fix #956 | Maximilian Hils | 2016-02-19 | 2 | -11/+5 |
|/ / | |||||
* | | Merge remote-tracking branch 'duffer/pretty-host' | Maximilian Hils | 2016-02-18 | 3 | -5/+39 |
|\ \ | |/ |/| | |||||
| * | Fixup more tests | Shadab Zafar | 2016-02-18 | 2 | -5/+8 |
| * | Incorporate comments made during review | Shadab Zafar | 2016-02-18 | 1 | -5/+3 |
| * | Use host header values only when the ports match | Shadab Zafar | 2016-02-18 | 2 | -3/+12 |
| * | Handle port numbers in host header | Shadab Zafar | 2016-02-17 | 2 | -3/+27 |
* | | Merge pull request #964 from mitmproxy/flat-structure | Maximilian Hils | 2016-02-18 | 291 | -392/+77 |
|\ \ | |||||
| * | | fix .landscape.yml | Maximilian Hils | 2016-02-18 | 1 | -2/+2 |
| * | | fix test paths, move coverage config into setup.py | Maximilian Hils | 2016-02-18 | 4 | -14/+15 |
| * | | combine projects | Maximilian Hils | 2016-02-18 | 219 | -375/+59 |
| * | | move pathod/.sources to root | Maximilian Hils | 2016-02-18 | 3 | -0/+0 |
| * | | move mitmproxy/web to root | Maximilian Hils | 2016-02-18 | 66 | -0/+0 |
* | | | Merge pull request #962 from mitmproxy/simpler-issue-template | Thomas Kriechbaumer | 2016-02-18 | 2 | -38/+6 |
|\| | | |||||
| * | | remove nonmeaningful contributing section from the readme | Maximilian Hils | 2016-02-18 | 1 | -23/+0 |
| * | | simplify issue template | Maximilian Hils | 2016-02-18 | 1 | -15/+6 |
|/ / | |||||
* | | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-18 | 158 | -162/+215 |
|\ \ | |||||
| * \ | 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 'Kriechi-h2' | Aldo Cortesi | 2016-02-18 | 2 | -16/+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 |
| | | |/ | |||||
| * | / | Make fuzzing run again | Aldo Cortesi | 2016-02-18 | 2 | -7/+4 |
| |/ / | |||||
| * | | Merge pull request #958 from Kriechi/issue-template | Aldo Cortesi | 2016-02-18 | 3 | -40/+54 |
| |\ \ | |||||
| | * | | add issue template | Thomas Kriechbaumer | 2016-02-17 | 3 | -40/+54 |
| | |/ | |||||
| * | | Pull bin to the top, move pathod examples to examples dir | Aldo Cortesi | 2016-02-18 | 14 | -5/+5 |
| * | | Merge remote-tracking branch 'origin/unify' | Aldo Cortesi | 2016-02-18 | 4 | -9/+88 |
| |\ \ | |||||
| | * | | add combined MANIFEST.in and CHANGELOG | Maximilian Hils | 2016-02-17 | 5 | -87/+89 |
| | |/ | |||||
| * | | Adjust release for new repo structure | Aldo Cortesi | 2016-02-18 | 8 | -20/+7 |
| * | | Docs and examples to top level | Aldo Cortesi | 2016-02-18 | 137 | -4/+4 |
| * | | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxy | Aldo Cortesi | 2016-02-18 | 3 | -6/+47 |
| |\ \ | |||||
| | * \ | Merge pull request #952 from fimad/master | Aldo Cortesi | 2016-02-18 | 3 | -6/+47 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Add a content view for query parameters | Will Coster | 2016-02-16 | 3 | -6/+47 |
| | |/ | |||||
| * / | One CHANGELOG at the top of the repo | Aldo Cortesi | 2016-02-18 | 2 | -84/+19 |
| |/ | |||||
* / | move bin into release, update rtool | Maximilian Hils | 2016-02-18 | 14 | -23/+8 |
|/ | |||||
* | Merge pull request #950 from Kriechi/rename | Aldo Cortesi | 2016-02-17 | 285 | -346/+341 |
|\ | |||||
| * | remove test/ from py.test commands | Thomas Kriechbaumer | 2016-02-16 | 2 | -3/+3 |
| * | fix minor things | Thomas Kriechbaumer | 2016-02-16 | 6 | -7/+7 |
| * | move py.test options to ini-file | Thomas Kriechbaumer | 2016-02-16 | 3 | -3/+6 |
| * | move tservers helper | Thomas Kriechbaumer | 2016-02-16 | 5 | -33/+35 |
| * | rename ProxTest -> ProxyTest | Thomas Kriechbaumer | 2016-02-16 | 5 | -48/+48 |