aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use dev-scripts on CIThomas Kriechbaumer2016-02-253-5/+6
* fix #977Thomas Kriechbaumer2016-02-241-1/+1
* fix h2 importsThomas Kriechbaumer2016-02-231-12/+12
* Merge branch 'ParthGanatra-pip-upgrade'Thomas Kriechbaumer2016-02-231-0/+1
|\
| * Update dev.shParth Ganatra2016-02-231-0/+1
* | fix coverage collectionMaximilian Hils2016-02-231-2/+2
|/
* Merge pull request #967 from dufferzafar/766Aldo Cortesi2016-02-221-3/+3
|\
| * har_extractor: Replace deprecated stuff with recommended onesShadab Zafar2016-02-201-3/+3
| * har_extractor: Use items() instead of iteritems()Shadab Zafar2016-02-201-2/+2
* | Doc tweaksAldo Cortesi2016-02-215-6/+11
* | Merge branch 'master' of github.com:mitmproxy/mitmproxyAldo Cortesi2016-02-212-2/+2
|\ \
| * | fix proxy reconnectMaximilian Hils2016-02-201-1/+1
| * | fix testsThomas Kriechbaumer2016-02-201-1/+1
| |/
* / First-order conversion of rtool to flat directory structureAldo Cortesi2016-02-191-80/+59
|/
* fix #951Maximilian Hils2016-02-191-9/+15
* Merge branch 'master' of https://github.com/mitmproxy/mitmproxyMaximilian Hils2016-02-194-17/+27
|\
| * console: slightly less hacky hack show http2 warning after first tickAldo Cortesi2016-02-191-7/+8
| * Merge pull request #960 from Kriechi/enable-h2Aldo Cortesi2016-02-194-17/+26
| |\
| | * enable HTTP/2 by default if availableThomas Kriechbaumer2016-02-184-17/+26
* | | fix #956Maximilian Hils2016-02-192-11/+5
|/ /
* | Merge remote-tracking branch 'duffer/pretty-host'Maximilian Hils2016-02-183-5/+39
|\ \ | |/ |/|
| * Fixup more testsShadab Zafar2016-02-182-5/+8
| * Incorporate comments made during reviewShadab Zafar2016-02-181-5/+3
| * Use host header values only when the ports matchShadab Zafar2016-02-182-3/+12
| * Handle port numbers in host headerShadab Zafar2016-02-172-3/+27
* | Merge pull request #964 from mitmproxy/flat-structureMaximilian Hils2016-02-18291-392/+77
|\ \
| * | fix .landscape.ymlMaximilian Hils2016-02-181-2/+2
| * | fix test paths, move coverage config into setup.pyMaximilian Hils2016-02-184-14/+15
| * | combine projectsMaximilian Hils2016-02-18219-375/+59
| * | move pathod/.sources to rootMaximilian Hils2016-02-183-0/+0
| * | move mitmproxy/web to rootMaximilian Hils2016-02-1866-0/+0
* | | 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
| | |\ \ | | | |/ | | |/|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 12:23:13 +0000