aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)Author
2015-01-19Merge branch 'version-3.1' into cursor-paginationTom Christie
2015-01-19NotImplemented -> NotImplementedErrorTom Christie
2015-01-19Merge masterTom Christie
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
2015-01-19Drop trailing whitespace on indented JSON output. Closes #2429.Tom Christie
2015-01-19NotImplemented is not an exceptionAlexander Dutton
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 Polyconseil/fbochu/timedelta-json-serialiser-py...Tom Christie
2015-01-19Fix timedelta JSON serialization on Python 2.6.Fabien Bochu
2015-01-19Add offset support for cursor paginationTom Christie
2015-01-19Merge pull request #2427 from DavidMuller/pytest_version_bumpsXavier Ordoquy
2015-01-18Save objects before assigning them in InheritedModelSerializationTests; Djang...David Muller
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-17Cleaning up cursor implementationTom Christie
2015-01-17First pass at cursor paginationTom Christie
2015-01-16Merge pull request #2419 from tomchristie/include-pagination-in-browsable-apiTom Christie
2015-01-16Fix compat issuesTom Christie
2015-01-16More pagination tests & cleanupTom Christie
2015-01-16Minor test cleanupTom Christie
2015-01-15Tests for LimitOffsetPaginationTom Christie
2015-01-15Flake 8 fixesTom Christie
2015-01-15Tweaks, and add pagination controls for offset/limit.Tom Christie
2015-01-14TweaksTom Christie
2015-01-14Include pagination control in browsable APITom Christie
2015-01-14Include paragraph around view description in browable APITom Christie
2015-01-14Include paragraph around view description in browable APITom Christie
2015-01-14Preserve ordering on relationship drop-down choices. Closes #2408.Tom Christie
2015-01-13Merge pull request #2395 from tomchristie/pagination-apiTom Christie
2015-01-13API tweaks and pagination documentationTom Christie
2015-01-13Lower header font weights for nicer docs styleTom Christie
2015-01-13Update internationalization docsTom Christie
2015-01-13Translation info -> project managementTom Christie
2015-01-13Merge pull request #2407 from philipn/filters_link_fixCarlton Gibson
2015-01-13Fix link to `django-rest-framework-filters` (formerlyPhilip Neustrom
2015-01-12Merge pull request #2399 from askholme/masterTom Christie
2015-01-12Merge pull request #2401 from jpadilla/masterTom Christie
2015-01-12Fix error when NUM_PROXIES is greater than oneJosé Padilla
2015-01-11Fix ident format when using HTTP_X_FORWARDED_FORJosé Padilla
2015-01-10Merge pull request #2398 from sloria/readme-linksJosé Padilla
2015-01-10Make FileUploadParser work with standard django APIAsk Holme
2015-01-10Fix broken links in READMESteven Loria
2015-01-10Merge pull request #2397 from travelton/TweakTutorialDocsTom Christie
2015-01-10Merge pull request #2385 from linovia/release/3.0.33.0.3Xavier Ordoquy