aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-02-06Fix typoTom Christie
2015-02-06Minor cleanupTom Christie
2015-02-06Merge branch 'version-3.1' of ↵Tom Christie
git://github.com/jpadilla/django-rest-framework into version-3.1
2015-02-06Upgrade pending deprecations to deprecationsTom Christie
2015-02-06Merge pull request #2527 from linovia/feature/secured_pypi_uploadTom Christie
Use twine to upload to pypi.
2015-02-06Pagination imagesTom Christie
2015-02-06Add Twine to the requirements.Xavier Ordoquy
2015-02-06Add Twine to the requirements.Xavier Ordoquy
2015-02-06Internationalization docsTom Christie
2015-02-06Fixed a typo.Xavier Ordoquy
2015-02-06Use twine to upload to pypi.Xavier Ordoquy
2015-02-06Add trim_whitespace to CharField #2517José Padilla
If set to `True` then leading and trailing whitespace is trimmed. Defaults to `True`.
2015-02-05Revert some of the changes made in 1-serialization.mdMichael Marvick
2015-02-06Link to ModelSerializer APITom Christie
2015-02-06Merge branch 'version-3.1' of ↵Tom Christie
https://github.com/tomchristie/django-rest-framework into version-3.1
2015-02-06Tweak gitignoreTom Christie
2015-02-06Drop 2.x announcementsTom Christie
2015-02-05Merge pull request #2524 from Kaptian/patch-1Xavier Ordoquy
Allow non-standard User models with Throttling
2015-02-05Update throttling.pyKaptian
Use pk pseudo attribute for identifying the user (in case the user model is not the default and has a different column name for the unique id)
2015-02-05Merge pull request #2496 from jpadilla/version-3.1Tom Christie
Support for Django 1.8 ArrayField
2015-02-05Fix possible nested array fieldsJosé Padilla
2015-02-04Merge remote-tracking branch 'upstream/version-3.1' into version-3.1José Padilla
2015-02-04Add child to ListField when using ArrayFieldJosé Padilla
2015-02-05Minor bits of test cleanupTom Christie
2015-02-05Merge branch 'brandoncazander-version-3.1-2489' into version-3.1Tom Christie
2015-02-05Fix NamespaceVersioning with hyperlinked serializer fieldsTom Christie
2015-02-04Merge branch 'version-3.1-2489' of ↵Tom Christie
git://github.com/brandoncazander/django-rest-framework into brandoncazander-version-3.1-2489
2015-02-04Updating release notesTom Christie
2015-02-04Merge pull request #2518 from longhotsummer/patch-1Tom Christie
FIX: Don't default to list in method args
2015-02-04Parens around if clauseGreg Kempe
2015-02-04Merge pull request #2519 from Ofir-Purple/optimize-token-auth-queriesTom Christie
Prefetching the user object when getting the token in TokenAuthentication
2015-02-04Use inline ifGreg Kempe
2015-02-04Prefetching the user object when getting the token in TokenAuthentication.Ofir Ovadia
Since the user object is fetched 4 lines after getting Token from the database, this removes a DB query for each token-authenticated request.
2015-02-04FIX: Don't default to list in method argsGreg Kempe
Fixes @list_route and @detail_route so that they don't initialize their `methods` parameter as a list. In some cases the list gets cleared, and the result is that default parameter is now empty, and may get reused unexpectedly.
2015-02-04Remove erronous checkinTom Christie
2015-02-04Minor authentication message improvement.Tom Christie
2015-02-04Merge pull request #2512 from heywbj/docsXavier Ordoquy
Add django-rest-framework-recursive to docs
2015-02-03docsWarren Jin
2015-02-03Merge pull request #2509 from jamescooke/doc-fixesTom Christie
Small documentation fixes
2015-02-03Small documentation fixesJames Cooke
* Remove "you you" from viewsets API-guide * Fix link from routers API-guide to viewsets API-guide
2015-02-03Reorganize tests.Brandon Cazander
2015-02-03Fleshing out 3.1 announcementTom Christie
2015-02-02Remove unnecessary APIRequestFactory get from tests.Brandon Cazander
2015-02-02Provide rest_framework.resolve. Fixes #2489Brandon Cazander
2015-02-03Merge pull request #2503 from tail/missing-space-error-stringTom Christie
Fixed missing whitespace in error string.
2015-02-02Fixed missing whitespace in error string.Jason Yan
2015-02-02Merge pull request #2501 from thedrow/patch-10Xavier Ordoquy
Fixed typos in docstrings
2015-02-02Fixed typos in docstrings.Omer Katz
2015-02-01Merge pull request #2498 from dustinfarris/update-eda-linkTom Christie
Update link for ember-django-adapter
2015-02-01Update link for ember-django-adapterDustin Farris