Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | 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 |
|/ | |||||
* | 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 |
| * | fix all libpathod->pathod references | Thomas Kriechbaumer | 2016-02-16 | 37 | -71/+63 |
| * | fix all libmproxy->mitmproxy references | Thomas Kriechbaumer | 2016-02-16 | 69 | -177/+175 |
| * | rename mitmproxy source directory | Thomas Kriechbaumer | 2016-02-16 | 126 | -0/+0 |
| * | rename pathod source directory | Thomas Kriechbaumer | 2016-02-16 | 59 | -0/+0 |
|/ | |||||
* | Merge pull request #949 from fimad/master | Aldo Cortesi | 2016-02-16 | 1 | -4/+4 |
|\ | |||||
| * | Fix failing unit tests caused by a69d223b | Will Coster | 2016-02-15 | 1 | -4/+4 |
|/ | |||||
* | fix wheel creation, re-add MANIFEST.in | Maximilian Hils | 2016-02-16 | 5 | -6/+7 |
* | travis: remove sdist builds | Maximilian Hils | 2016-02-16 | 1 | -1/+1 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-16 | 2 | -5/+13 |
|\ | |||||
| * | Merge pull request #948 from fimad/master | Maximilian Hils | 2016-02-16 | 2 | -5/+13 |
| |\ | |||||
| | * | Preserve host header when modifying request path | Will Coster | 2016-02-15 | 2 | -5/+13 |
| |/ | |||||
* / | temporarily silence flaky tests | Maximilian Hils | 2016-02-16 | 2 | -2/+5 |
|/ | |||||
* | remove MANIFEST.in, move Dockerfile to root | Maximilian Hils | 2016-02-16 | 5 | -17/+0 |
* | update mitmproxy changelog | Maximilian Hils | 2016-02-16 | 1 | -0/+23 |
* | rtool: remove support for source distributions | Maximilian Hils | 2016-02-16 | 1 | -40/+22 |
* | Merge branch 'master' of https://github.com/mitmproxy/mitmproxy | Maximilian Hils | 2016-02-16 | 4 | -1/+1 |
|\ | |||||
| * | Satisfy pip constraints, set +x on executables | Aldo Cortesi | 2016-02-16 | 4 | -1/+1 |
* | | fix release tool, refs #947 | Maximilian Hils | 2016-02-16 | 11 | -101/+84 |
|/ | |||||
* | update shield.io badges | Maximilian Hils | 2016-02-15 | 2 | -3/+3 |
* | Merge pull request #937 from mhils/single-repo | Maximilian Hils | 2016-02-15 | 627 | -139/+20169 |
|\ | |||||
| * | use own shields instance, update pathod readme | Maximilian Hils | 2016-02-15 | 7 | -118/+90 |
| * | update README.rst, minor fixes | Maximilian Hils | 2016-02-15 | 6 | -104/+168 |
| * | fix ALPN checks | Maximilian Hils | 2016-02-15 | 6 | -7/+7 |
| * | fix appveyor, re-introduce requirements.txt | Maximilian Hils | 2016-02-15 | 8 | -21/+31 |
| * | adjust travis | Maximilian Hils | 2016-02-15 | 5 | -72/+24 |
| * | fix tests | Maximilian Hils | 2016-02-15 | 3 | -6/+12 |
| * | move tests into shared folder | Maximilian Hils | 2016-02-15 | 170 | -0/+0 |
| * | dev -> dev.sh | Maximilian Hils | 2016-02-15 | 1 | -0/+0 |
| * | merge metadata files | Maximilian Hils | 2016-02-15 | 39 | -420/+46 |
| * | add release | Maximilian Hils | 2016-02-15 | 6 | -0/+625 |
| |\ | |||||
| | * | make sure that we don't have build race conditions | Maximilian Hils | 2016-02-14 | 1 | -0/+2 |