summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Request->Response.Cory Benfield2014-09-091-1/+1
|/ /
* | Merge pull request #2203 from Lukasa/remove_certifiKenneth Reitz2014-09-052-1/+19
|\ \
| * | Link to Mozilla trust store.Cory Benfield2014-09-041-1/+2
| * | Remove hard certifi dependency and document.Cory Benfield2014-09-042-1/+18
* | | Merge pull request #2199 from mtorromeo/patch-1Kenneth Reitz2014-09-041-2/+4
|\ \ \
| * | | Open README and HISTORY as utf-8 encoded files (fixes #2196)Massimiliano Torromeo2014-09-031-2/+4
| |/ /
* | | Merge pull request #2193 from sigmavirus24/bug/2192Kenneth Reitz2014-09-042-2/+11
|\ \ \
| * | | Consolidate error handlingIan Cordasco2014-09-031-5/+2
| * | | Add test for invalid portIan Cordasco2014-08-291-0/+3
| * | | Merge remote-tracking branch 'kevinburke/domain-failure-connection-error' int...Ian Cordasco2014-08-291-0/+5
| |\ \ \
| | * | | Add test that invalid domain raises a ConnectionErrorKevin Burke2014-08-291-0/+5
| | |/ /
| * | | Capture and re-raise urllib3 ProtocolErrorIan Cordasco2014-08-291-0/+4
| |/ /
* | | Merge pull request #2191 from kevinburke/commaKenneth Reitz2014-09-041-1/+1
|\ \ \
| * | | add trailing commaKevin Burke2014-08-291-1/+1
| |/ /
* | | Merge pull request #2187 from kevinburke/more-docsKenneth Reitz2014-09-047-34/+28
|\ \ \
| * | | tildesKevin Burke2014-08-291-1/+1
| * | | s/behavior/behaviourKevin Burke2014-08-293-3/+3
| * | | Document Timeout behaviourKevin Burke2014-08-295-30/+24
* | | | requests[security]Kenneth Reitz2014-09-041-1/+1
* | | | Merge pull request #2195 from sigmavirus24/bettersslKenneth Reitz2014-09-041-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Add betterssl extraIan Cordasco2014-08-291-0/+3
|/ / /
* | | v2.4.0 changelogv2.4.0Kenneth Reitz2014-08-291-3/+14
* | | Revert "Documentation update : connection keep alive"Kenneth Reitz2014-08-291-4/+0
| |/ |/|
* | 3.4 classifierKenneth Reitz2014-08-281-0/+1
* | keep-aliveKenneth Reitz2014-08-281-1/+2
* | v2.4.0Kenneth Reitz2014-08-281-2/+2
|/
* Merge pull request #2178 from sigmavirus24/env-retrievalKenneth Reitz2014-08-261-24/+28
|\
| * Update verify check and doc-stringIan Cordasco2014-08-261-7/+5
| * Add Session method to merge environment settings with per-request settingsIan Cordasco2014-08-261-24/+30
* | Merge pull request #2183 from Lukasa/docupdateKenneth Reitz2014-08-261-1/+1
|\ \ | |/ |/|
| * Remove timeline.json from docs.Cory Benfield2014-08-261-1/+1
|/
* Merge pull request #2174 from kevinburke/test-clarificationKenneth Reitz2014-08-261-1/+3
|\
| * clarify commentKevin Burke2014-08-231-1/+1
| * Clarify which tests to run in the MakefileKevin Burke2014-08-231-1/+3
* | Merge pull request #2176 from kevinburke/connectKenneth Reitz2014-08-266-13/+130
|\ \
| * | woopsKevin Burke2014-08-241-3/+2
| * | assert connect timeout inheritanceKevin Burke2014-08-241-2/+4
| * | ConnectTimeout multiple inheritanceKevin Burke2014-08-241-2/+2
| * | revert changeKevin Burke2014-08-241-1/+1
| * | Add support for connect timeoutsKevin Burke2014-08-236-14/+130
| |/
* | Merge pull request #2179 from kevinburke/urllib3-pypy-sslKenneth Reitz2014-08-268-24/+100
|\ \ | |/ |/|
| * Updates urllib3 to 528ad3cKevin Burke2014-08-258-24/+100
|/
* Merge pull request #2172 from ContinuousFunction/masterKenneth Reitz2014-08-222-2/+3
|\
| * Adding my name to authorsContinuousFunction2014-08-211-1/+1
| * Adding myself to authors.ContinuousFunction2014-08-211-1/+1
| * Adding my name to authors.ContinuousFunction2014-08-211-0/+1
| * Added space and sentence caseContinuousFunction2014-08-211-2/+2
* | Cleanup grammar from previous commit.Cory Benfield2014-08-221-3/+4
* | Merge pull request #2173 from tychotatitscheff/masterCory Benfield2014-08-221-0/+3
|\ \
| * | Documentation update : connection keep alivetat36572014-08-221-0/+3
|/ /