aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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 available
| | * 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
| | | | | | | | from: https://github.com/mitmproxy/netlib/pull/121
* | Merge pull request #964 from mitmproxy/flat-structureMaximilian Hils2016-02-18291-392/+77
|\ \ | | | | | | Flat structure
| * | 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
|\| | | | | | | | Simplify Issue Template
| * | 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 misleading documentation for clipboard command
| | * | Fix helpThiago Arrais2016-02-171-1/+1
| | | | | | | | | | | | | | | | 'P' can also be used on the request screen!
| * | | 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 template
| | * | 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 parameters
| | | * Add a content view for query parametersWill Coster2016-02-163-6/+47
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The query content view uses format_dict to display a table of query parameters and is made the default content view for requests with query parameters and no request body. To facilitate this the query parameter dictionary of HTTPRequests is added to the metadata content view parameter under the "query" key. Additionally, the logic for handling "no content" messages is moved from contentviews.get_content_view to ViewAuto. This is necessary as it allows the query content view to be displayed when there is no request body.
| * / 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
|\ | | | | Rename lib folders
| * 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 a69d223b
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 06:32:46 +0000