aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-01-23Drop erronous check-inTom Christie
2015-01-23Merge pull request #2446 from tomchristie/django-18-alphaTom Christie
Support 1.8-alpha.
2015-01-23Move 1.8-alpha out of 'expected failures'Tom Christie
2015-01-23More sensible response caching.Tom Christie
2015-01-23More graceful handling of malformed Content-DispositionTom Christie
2015-01-23Add missing skipUnless(django_filters)Tom Christie
2015-01-23Fix template loader monkey patching to also support 1.8Tom Christie
2015-01-23Fix test matrixTom Christie
2015-01-23Drop django-filter from 1.8Tom Christie
2015-01-23Work around meta API differencesTom Christie
2015-01-23Merge pull request #2441 from linovia/bugfix/2425Tom Christie
Support for Django 1.8a1
2015-01-22Merge pull request #2444 from duncm/patch-1Tom Christie
fix link to Django CSRF docs
2015-01-22fix link to Django CSRF docsDuncan Maitland
2015-01-21Owned by import *Xavier Ordoquy
2015-01-21Workaround Django issue 24198.Xavier Ordoquy
2015-01-21Use compact traceback for errors reporting.Xavier Ordoquy
2015-01-21Do not render HTML output for hidden fields. Closes #2410.Tom Christie
2015-01-21Make ReturnDict cachable. Closes #2360.Tom Christie
2015-01-21Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2015-01-21Allow missing fields option for inherited serializers. Closes #2388.Tom Christie
2015-01-20Merge pull request #2438 from soooooot/patch-1José Padilla
correcting unclosed quote in docs routers.md
2015-01-20correcting unclosed quote in routers.mdsoooooot
correcting unclosed quote in routers.md
2015-01-19Merge pull request #2437 from erictheise/patch-2José Padilla
correcting "it's" to "its" in Tutorial 1
2015-01-19correcting "it's" to "its" in Tutorial 1Eric Theise
2015-01-19Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2015-01-19NotImplemented -> NotImplementedErrorTom Christie
2015-01-19Merge pull request #2434 from alexsdutton/patch-1Tom Christie
NotImplemented is not an exception
2015-01-19NotImplemented is not an exceptionAlexander Dutton
`NotImplemented` is a singleton object, not an exception. You should be raising `NotImplementedError` here instead.
2015-01-19ReturnDict and ReturnList repr as standard dict/list. Closes #2421.Tom Christie
2015-01-19Handle UUID objects in JSONEncoder. Closes #2433.Tom Christie
2015-01-19Merge pull request #2430 from ↵Tom Christie
Polyconseil/fbochu/timedelta-json-serialiser-python26-support Fix timedelta JSON serialization on Python 2.6.
2015-01-19Fix timedelta JSON serialization on Python 2.6.Fabien Bochu
2015-01-19Merge pull request #2427 from DavidMuller/pytest_version_bumpsXavier Ordoquy
Preliminary Support For Django 1.8 Alpha
2015-01-18Save objects before assigning them in InheritedModelSerializationTests; ↵David Muller
Django 1.8 now throws an error when assigning unsaved objects to Foreign Key, GenericForeignKey, and OneToOneFields
2015-01-18Add Django 1.8 alpha to test matrixDavid Muller
2015-01-18Bump pytest version in tox.ini to 2.6.4David Muller
2015-01-18Bump pytest-django version in tox.ini to 2.8.0David Muller
2015-01-18Bump pytest version to 2.6.4David Muller
2015-01-18Bump pytest-django version to 2.8.0David Muller
2015-01-14Preserve ordering on relationship drop-down choices. Closes #2408.Tom Christie
2015-01-13Merge pull request #2407 from philipn/filters_link_fixCarlton Gibson
Fix link to `django-rest-framework-filters`
2015-01-13Fix link to `django-rest-framework-filters` (formerlyPhilip Neustrom
`django-rest-framework-chain`)
2015-01-12Merge pull request #2399 from askholme/masterTom Christie
Fix for FileUploadParser with 3.x
2015-01-12Merge pull request #2401 from jpadilla/masterTom Christie
Fix ident format when using HTTP_X_FORWARDED_FOR
2015-01-12Fix error when NUM_PROXIES is greater than oneJosé Padilla
2015-01-11Fix ident format when using HTTP_X_FORWARDED_FORJosé Padilla
If NUM_PROXIES setting is set to None, HTTP_X_FORWARDED_FOR might be used as is, which might contain spaces and cause errors on cache backends like memcached.
2015-01-10Merge pull request #2398 from sloria/readme-linksJosé Padilla
Fix broken links in README
2015-01-10Make FileUploadParser work with standard django APIAsk Holme
Output from parsers ends up in a Django MergeDict and they exists elements to be dicts - not None
2015-01-10Fix broken links in READMESteven Loria
2015-01-10Merge pull request #2397 from travelton/TweakTutorialDocsTom Christie
Tweaked a few issues in the tutorial documentation.