aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | update commentsMatthew Shao2016-03-263-7/+7
| | * | update document for the removal of CONTENT_MISSINGMatthew Shao2016-03-261-2/+1
| | * | replace CONTENT_MISSING with None.Matthew Shao2016-03-2614-47/+37
| | * | Setting CONTENT_MISSING to NoneMatthew Shao2016-03-261-1/+1
| |/ /
| | * mergeZohar Lorberbaum2016-03-281-1/+0
| | * Merge remote-tracking branch 'mitmproxy/master'Zohar Lorberbaum2016-03-281-1/+0
| | * Merge with masterZohar Lorberbaum2016-03-2827-86/+96
| | * cleaner target urlZohar Lorberbaum2016-03-282-6/+7
| | * locust_task re-use locust_code.Zohar Lorberbaum2016-03-272-69/+25
| | * pep8Zohar Lorberbaum2016-03-252-20/+20
| | * Add UI shortcuts.Zohar Lorberbaum2016-03-245-0/+18
| | * Flow export to locust.io load test tool.Zohar Lorberbaum2016-03-232-4/+308
| |/
* / snapshots: fix build tagMaximilian Hils2016-03-311-1/+2
|/
* py3++Maximilian Hils2016-03-204-22/+30
* netlib: request.path can be NoneMaximilian Hils2016-03-202-2/+10
* py3++Maximilian Hils2016-03-206-26/+44
* py3++Maximilian Hils2016-03-203-52/+22
* py3++Maximilian Hils2016-03-209-38/+37
* Merge pull request #1047 from mitmproxy/no-coverage-by-defaultThomas Kriechbaumer2016-03-203-3/+3
|\
| * py.test: disable coverage collection by defaultMaximilian Hils2016-03-203-3/+3
* | py3++: iteritemsMaximilian Hils2016-03-206-20/+28
* | py3++: cStringIOMaximilian Hils2016-03-2015-66/+59
|/
* Merge pull request #1045 from mitmproxy/py3-scriptsMaximilian Hils2016-03-2011-26/+41
|\
| * fix script exception displayMaximilian Hils2016-03-191-2/+4
| * port mitmproxy.scripts to py3Maximilian Hils2016-03-1910-24/+37
* | Merge pull request #1043 from mitmproxy/better-scriptsThomas Kriechbaumer2016-03-1912-161/+186
|\|
| * fix tests on OSXMaximilian Hils2016-03-191-5/+10
| * simplify tests for @concurrentMaximilian Hils2016-03-193-89/+33
| * add tests for mitmproxy.script.reloaderMaximilian Hils2016-03-192-3/+32
| * improve mitmproxy.scripts semantics, clean up testsMaximilian Hils2016-03-198-72/+119
* | fix pyOpenSSL versionMaximilian Hils2016-03-191-1/+1
* | update pyOpenSSLMaximilian Hils2016-03-191-2/+2
|/
* restrict cryptography version for pyopenssl compatMaximilian Hils2016-03-191-1/+1
* fix dependency versionsMaximilian Hils2016-03-181-4/+4
* Merge remote-tracking branch 'origin/requires-io-master'Maximilian Hils2016-03-181-4/+4
|\
| * [requires.io] dependency updaterequires.io2016-03-181-4/+4
* | remove code duplicationMaximilian Hils2016-03-181-9/+6
|/
* Merge pull request #1040 from felixonmars/patch-1Thomas Kriechbaumer2016-03-181-1/+1
|\
| * Allow lxml 3.6Felix Yan2016-03-181-1/+1
|/
* Merge pull request #1014 from ikoz/masterMaximilian Hils2016-03-177-6/+86
|\
| * Make the add-server-certs-to-client-chain and verify-upstream-cert options mu...ikoz2016-03-161-3/+15
| * Revert "Create mutually exclusive group for add-server-certs-to-client-chain ...ikoz2016-03-161-3/+2
| * Rename 'server' to 'upstream' in identifiers related to the AddServerCertsToC...ikoz2016-03-165-22/+22
| * Create mutually exclusive group for add-server-certs-to-client-chain and veri...ikoz2016-03-161-2/+3
| * Move more init things inside AddServerCertsToClientChainMixinikoz2016-03-161-20/+13
| * Restructuring of the AddServerCertsToClientChain test so that it uses a Mixin...ikoz2016-03-161-38/+25
| * Add tests for add-server-certs-to-client-chain featureikoz2016-03-152-0/+62
| * fix for sslinfo cert chain printing bug - now all certs get printedikoz2016-03-151-2/+3
| * New option: Add server certs to client chainikoz2016-03-084-1/+26
* | Merge pull request #1032 from cle1000/patch-2Maximilian Hils2016-03-161-1/+1
|\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 07:16:55 +0000