summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #245 from bpicolo/fix_py34_hangingGabriel Falcão2015-05-182-3/+33
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix py34 hangingBen Picolo2015-05-132-3/+33
|/ / / / / / / /
* | | | | | | | New release: 0.8.9Gabriel Falcão2015-05-114-5/+5
* | | | | | | | Merge pull request #244 from jimabramson/has-requestGabriel Falcão2015-05-115-1/+96
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | add httpretty.has_request() and testjsa2015-05-075-1/+96
|/ / / / / / /
* | | | | | | New release: 0.8.8Gabriel Falcão2015-03-114-5/+5
* | | | | | | New release: 0.8.7Gabriel Falcão2015-03-114-5/+5
* | | | | | | New release: 0.8.6Gabriel Falcão2015-03-114-5/+5
* | | | | | | Merge pull request #226 from jmcarp/fix-tests-for-208Gabriel Falcão2015-03-112-13/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update and test PR #208.Joshua Carp2015-02-272-14/+46
| * | | | | | Disable sendall/recv magic for non-http(s) socketsMarco Paolini2015-02-271-0/+2
|/ / / / / /
* | | | | | Merge pull request #216 from frankamp/masterGabriel Falcão2015-02-212-26/+25
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | updating tests to reflect blocking underlying socketJosh Frankamp2015-02-161-15/+12
| * | | | | removing bad setsockopt implementation and replacing with a passthrough to th...Josh Frankamp2015-02-081-11/+13
* | | | | | releasing as wheelGabriel Falcão2015-02-211-1/+1
* | | | | | New release: 0.8.5Gabriel Falcão2015-02-194-4/+4
* | | | | | moving requirementsGabriel Falcão2015-02-192-4/+5
* | | | | | fixing build in python 3.4Gabriel Falcão2015-02-124-6/+8
* | | | | | not building against pypyGabriel Falcão2015-02-123-3/+5
* | | | | | enforcing versionsGabriel Falcão2015-02-121-4/+4
* | | | | | allowing failure of python 2.6 buildGabriel Falcão2015-02-121-0/+1
* | | | | | fixing requirementsGabriel Falcão2015-02-121-5/+0
|/ / / / /
* | | | | New release: 0.8.4Gabriel Falcão2015-02-034-4/+4
* | | | | updating requirementsGabriel Falcão2015-02-032-1/+11
* | | | | Merge pull request #207 from andresriancho/masterGabriel Falcão2015-02-032-2/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix for https://github.com/gabrielfalcao/HTTPretty/issues/206Andres Riancho2015-01-071-2/+11
| * | | | Added test to reproduce https://github.com/gabrielfalcao/HTTPretty/issues/206Andres Riancho2015-01-071-0/+12
|/ / / /
* | | | Merge pull request #170 from chris-martin/disallow-real-connectionsGabriel Falcão2014-12-114-14/+104
|\ \ \ \ | |/ / / |/| | |
| * | | Allow_net_connect, prevent real connections (#157)Chris Martin2014-05-234-14/+104
| |/ /
* | | New release: 0.8.30.8.3Gabriel Falcao2014-06-194-4/+4
* | | Merge pull request #177 from klmitch/fix-readme-rstGabriel Falcão2014-06-194-3/+3
|\ \ \
| * | | Rename readme.rstKevin L. Mitchell2014-06-194-3/+3
|/ / /
* | | New release: 0.8.20.8.2Gabriel Falcao2014-06-194-4/+4
* | | adding readme.rst to manifest closes #176Gabriel Falcao2014-06-191-0/+1
* | | New release: 0.8.10.8.1Gabriel Falcao2014-06-194-4/+4
* | | Requirements: remove duplicated requirements for 'requests'.Cyril Roelandt2014-06-192-2/+1
* | | fixing typo in doctestGabriel Falcao2014-06-181-1/+1
* | | updating requirementsGabriel Falcao2014-06-181-0/+1
* | | Merge pull request #158 from luqmaan/https-port-fixGabriel Falcão2014-06-183-9/+177
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' of github.com:gabrielfalcao/HTTPretty into https-port-fixLuqmaan2014-05-163-9/+34
| |\ \ | |/ / |/| |
* | | Merge pull request #163 from aljosa/patch-1Gabriel Falcão2014-05-131-0/+26
|\ \ \
| * | | Update README.mdAljosa Mohorovic2014-04-201-0/+26
| | |/ | |/|
* | | Update README.mdGabriel Falcão2014-05-131-1/+0
* | | Merge pull request #159 from luqmaan/travis-build-fixesGabriel Falcão2014-05-132-8/+8
|\ \ \ | |/ / |/| |
| * | Specify version number for urllib3 in requirements.txtLuqmaan2014-04-041-1/+1
| * | Specify version number for packages in test-requirements.txtLuqmaan2014-04-041-7/+7
|/ /
| * Fix bug that occurs when using custom schema/port/regexLuqmaan2014-04-033-9/+177
|/
* Merge pull request #156 from andrewgross/patch-1CyrilRoelandteNovance2014-03-251-1/+1
|\
| * Minor TypoAndrew Gross2014-03-241-1/+1
|/
* Unit test for mocking of octet stream and fix to the codeMatt Millar2014-03-142-1/+24