aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #962 from mitmproxy/simpler-issue-templateThomas Kriechbaumer2016-02-182-38/+6
|\
| * remove nonmeaningful contributing section from the readmeMaximilian Hils2016-02-181-23/+0
| * simplify issue templateMaximilian Hils2016-02-181-15/+6
|/
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-18158-162/+215
|\
| * Merge pull request #959 from thiagoarrais/doc-fixAldo Cortesi2016-02-181-1/+1
| |\
| | * Fix helpThiago Arrais2016-02-171-1/+1
| * | Merge branch 'Kriechi-h2'Aldo Cortesi2016-02-182-16/+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
| * | | Make fuzzing run againAldo Cortesi2016-02-182-7/+4
| |/ /
| * | Merge pull request #958 from Kriechi/issue-templateAldo Cortesi2016-02-183-40/+54
| |\ \
| | * | add issue templateThomas Kriechbaumer2016-02-173-40/+54
| | |/
| * | Pull bin to the top, move pathod examples to examples dirAldo Cortesi2016-02-1814-5/+5
| * | Merge remote-tracking branch 'origin/unify'Aldo Cortesi2016-02-184-9/+88
| |\ \
| | * | add combined MANIFEST.in and CHANGELOGMaximilian Hils2016-02-175-87/+89
| | |/
| * | Adjust release for new repo structureAldo Cortesi2016-02-188-20/+7
| * | Docs and examples to top levelAldo Cortesi2016-02-18137-4/+4
| * | Merge branch 'master' of ssh.github.com:mitmproxy/mitmproxyAldo Cortesi2016-02-183-6/+47
| |\ \
| | * \ Merge pull request #952 from fimad/masterAldo Cortesi2016-02-183-6/+47
| | |\ \ | | | |/ | | |/|
| | | * Add a content view for query parametersWill Coster2016-02-163-6/+47
| | |/
| * / One CHANGELOG at the top of the repoAldo Cortesi2016-02-182-84/+19
| |/
* / move bin into release, update rtoolMaximilian Hils2016-02-1814-23/+8
|/
* Merge pull request #950 from Kriechi/renameAldo Cortesi2016-02-17285-346/+341
|\
| * remove test/ from py.test commandsThomas Kriechbaumer2016-02-162-3/+3
| * fix minor thingsThomas Kriechbaumer2016-02-166-7/+7
| * move py.test options to ini-fileThomas Kriechbaumer2016-02-163-3/+6
| * move tservers helperThomas Kriechbaumer2016-02-165-33/+35
| * rename ProxTest -> ProxyTestThomas Kriechbaumer2016-02-165-48/+48
| * fix all libpathod->pathod referencesThomas Kriechbaumer2016-02-1637-71/+63
| * fix all libmproxy->mitmproxy referencesThomas Kriechbaumer2016-02-1669-177/+175
| * rename mitmproxy source directoryThomas Kriechbaumer2016-02-16126-0/+0
| * rename pathod source directoryThomas Kriechbaumer2016-02-1659-0/+0
|/
* Merge pull request #949 from fimad/masterAldo Cortesi2016-02-161-4/+4
|\
| * Fix failing unit tests caused by a69d223bWill Coster2016-02-151-4/+4
|/
* fix wheel creation, re-add MANIFEST.inMaximilian Hils2016-02-165-6/+7
* travis: remove sdist buildsMaximilian Hils2016-02-161-1/+1
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-162-5/+13
|\
| * Merge pull request #948 from fimad/masterMaximilian Hils2016-02-162-5/+13
| |\
| | * Preserve host header when modifying request pathWill Coster2016-02-152-5/+13
| |/
* / temporarily silence flaky testsMaximilian Hils2016-02-162-2/+5
|/
* remove MANIFEST.in, move Dockerfile to rootMaximilian Hils2016-02-165-17/+0
* update mitmproxy changelogMaximilian Hils2016-02-161-0/+23
* rtool: remove support for source distributionsMaximilian Hils2016-02-161-40/+22
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-164-1/+1
|\
| * Satisfy pip constraints, set +x on executablesAldo Cortesi2016-02-164-1/+1
* | fix release tool, refs #947Maximilian Hils2016-02-1611-101/+84
|/
* update shield.io badgesMaximilian Hils2016-02-152-3/+3
* Merge pull request #937 from mhils/single-repoMaximilian Hils2016-02-15627-139/+20169
|\
| * use own shields instance, update pathod readmeMaximilian Hils2016-02-157-118/+90
| * update README.rst, minor fixesMaximilian Hils2016-02-156-104/+168
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 18:28:09 +0000