summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CHANGES for #930remove-extra-dependenciesCory Benfield2016-07-191-1/+5
* We actually require cryptography-based PyOpenSSL now.Cory Benfield2016-07-192-2/+2
* Update setup.cfgCory Benfield2016-07-191-2/+2
* Clean up some bugs.Cory Benfield2016-07-191-4/+4
* Bow before our fruit overlords.Cory Benfield2016-07-191-1/+1
* Update [secure] extra.Cory Benfield2016-07-191-2/+2
* Update docs guide with new dependenciesCory Benfield2016-07-191-7/+7
* Update PyOpenSSL to not use ndg-httpsclient or pyasn1Cory Benfield2016-07-191-53/+77
* Merge pull request #927 from dalguji/patch-1Ian Cordasco2016-07-171-2/+2
|\
| * Fixed typosdalguji2016-07-171-2/+2
|/
* Merge pull request #924 from nateprewitt/2699_boolean_timeoutCory Benfield2016-07-164-10/+33
|\
| * updating CHANGES and CONTRIBUTORSNate Prewitt2016-07-162-0/+6
| * adding in exception for booleans and zero values in timeoutsNate Prewitt2016-07-152-10/+27
|/
* Merge pull request #916 from haikuginger/target-flake8Ian Cordasco2016-07-111-1/+1
|\
| * Updating flake8 locationsJesse Shapiro2016-07-111-1/+1
|/
* Merge pull request #919 from jonparrott/update-security-linkCory Benfield2016-07-072-5/+6
|\
| * Merge branch 'master' into update-security-linkJon Wayne Parrott2016-07-071-1/+1
| |\ | |/ |/|
* | Merge pull request #920 from qwazerty/fix-doc-user-guideCory Benfield2016-07-071-1/+1
|\ \
| * | Fix doc syntax in user-guide.rstKevin Houdebert2016-07-071-1/+1
|/ /
| * Updating links to SSL warning help page. Fixes #918Jon Wayne Parrott2016-07-062-5/+6
|/
* Merge pull request #848 from palaviv/retry-historyCory Benfield2016-07-0511-15/+141
|\
| * Merge branch 'master' into retry-historypalaviv2016-07-041-1/+1
| |\ | |/ |/|
* | Merge pull request #915 from haikuginger/target-flake8Cory Benfield2016-07-041-1/+1
|\ \
| * | Pointing flake8 specifically at the urllib3 packageJesse Shapiro2016-07-041-1/+1
|/ /
| * Added CHANGES entrypalaviv2016-07-041-0/+3
| * Merge branch 'master' into retry-historypalaviv2016-07-0229-1180/+1095
| |\ | |/ |/|
* | Merge pull request #911 from jeremycline/poolmanager-case-insensitiveCory Benfield2016-07-014-6/+52
|\ \
| * | Update CHANGES.rst for #911Jeremy Cline2016-07-011-0/+2
| * | Normalize the scheme and host in the URL parserJeremy Cline2016-07-011-1/+6
| * | Tests for case-insensitivity in the scheme and hostJeremy Cline2016-07-012-5/+44
|/ /
* | Merge pull request #912 from Lukasa/changesCory Benfield2016-07-011-0/+5
|\ \
| * | CHANGES for #858 and #887Cory Benfield2016-07-011-0/+5
|/ /
* | Merge pull request #913 from Lukasa/jonparrott-fix-rtdCory Benfield2016-07-012-4/+5
|\ \
| * \ Merge branch 'fix-rtd' of https://github.com/jonparrott/urllib3 into jonparro...Cory Benfield2016-07-012-4/+5
| |\ \ |/ / /
| * | Adding docs/requirements.txt for readthedocs.Jon Wayne Parrott2016-06-302-4/+5
* | | Merge pull request #858 from snarfed/gae_warningCory Benfield2016-07-011-3/+4
|\ \ \ | |/ / |/| |
| * | add warning when timeout without total is used on App EngineRyan Barrett2016-06-301-2/+3
| * | Defer to URLFetch's default timeout instead of hard coding 5s.Ryan Barrett2016-06-301-1/+1
|/ /
* | Merge pull request #887 from jonparrott/new-docsCory Benfield2016-06-3025-1171/+1033
|\ \
| * | Addressing review commentsJon Wayne Parrott2016-06-291-1/+1
| * | Addressing review commentsJon Wayne Parrott2016-06-291-1/+1
| * | Addressing review commentsJon Wayne Parrott2016-06-292-19/+40
| * | Addressing review commentsJon Wayne Parrott2016-06-294-15/+15
| * | Removing TODOJon Wayne Parrott2016-06-281-1/+1
| * | Small pass at contributingJon Wayne Parrott2016-06-281-0/+3
| * | fixing socks and ssl docstrings.Jon Wayne Parrott2016-06-282-13/+15
| * | Adding app engine docsJon Wayne Parrott2016-06-282-5/+73
| * | Adding all reference docsJon Wayne Parrott2016-06-2811-406/+215
| * | Adding proxy sectionJon Wayne Parrott2016-06-281-3/+28
| * | Moving some stuff around.Jon Wayne Parrott2016-06-281-6/+12
View Lorry Controller Status