aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-22AuthTokenSerializer - properly render password fieldmdoglio
2015-03-20Merge pull request #2733 from pquentin/patch-reverseTom Christie
Put the needed import in one example
2015-03-20Put the needed import in one exampleQuentin Pradet
2015-03-17Merge pull request #2707 from ajyong/patch-1José Padilla
Fix typo in versioning docs
2015-03-17Fix typo in versioning docsAaron Yong
2015-03-17Merge pull request #2705 from diwu1989/patch-1Tom Christie
use SAFE_METHODS and make tuple
2015-03-16use SAFE_METHODS and make tupleDi Wu
2015-03-16Merge pull request #2703 from kylepjohnson/masterTom Christie
Add necessary imports to final urls.py example
2015-03-16Merge pull request #2702 from rubendura/masterTom Christie
Updates ducumentation DEFAULT_PAGE_SIZE left over after #2655
2015-03-16Add necessary imports to final urls.py exampleKyle P. Johnson
2015-03-16Updates ducumentation DEFAULT_PAGE_SIZE left over after #2655Rubén Durá Tarí
2015-03-16Merge pull request #2700 from tomchristie/do-not-paginate-if-page-size-noneTom Christie
Do not paginate if PAGE_SIZE=None
2015-03-16Merge pull request #2631 from Ins1ne/feature/issue-2559Tom Christie
Allow blank/null on radio.html choices
2015-03-16Do not paginate if PAGE_SIZE=NoneTom Christie
2015-03-16Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2015-03-16Latest translation stringsTom Christie
2015-03-16Merge pull request #2697 from jpadilla/testsTom Christie
Simplify test settings
2015-03-14Simplify test settingsJosé Padilla
2015-03-13Merge pull request #2691 from mochawich/patch-1Tom Christie
fixed missing anchor closing tag
2015-03-13fixed missing anchor closing tagmochawich
when next_url is none, big part of page html will be rendered under the <a href='#'> as it does not have a closing tag.
2015-03-13Merge pull request #2685 from rbarrois/rbarrois/fix_lookup_url_kwargXavier Ordoquy
Fix lookup_url_kwarg handling in viewsets (Fixes #2591).
2015-03-13Fix lookup_url_kwarg handling in viewsets.Raphaël Barrois
The ``lookup_url_kwarg`` is intended to set the name of a field in the URL regexps when using custom ``lookup_field``, but the routers ignore it altogether.
2015-03-13Fix the link to the old doc (#2681).Xavier Ordoquy
2015-03-12Merge pull request #2678 from vikingco/fix/ugettext-in-paginationJosé Padilla
Fixed problem with imporing rest_framework.views in apps.py
2015-03-12Fixed problem with imporing rest_framework.views in apps.pyDirk Moors
2015-03-11Merge pull request #2671 from esmail/patch-2José Padilla
Fix example of explicit format URL (for real).
2015-03-11Fix example of explicit format URL (for real).Esmail
Do what I meant to do in #2670: The link is displayed in the tutorial as "http://example.com/api/items/4.json" but the hyperlink itself and what the example code actually works with are (in my opinion, less pretty) URLs like "http://example.com/api/items/4/.json".
2015-03-11Merge pull request #2668 from Maplecroft/doc_fixesXavier Ordoquy
Fix for minor documentation typo
2015-03-11Fixed import statement in API docsJames Rutherford
2015-03-11Merge pull request #1 from tomchristie/masterJames Rutherford
Merge in from upstream
2015-03-10Merge pull request #2666 from balsdorf/patch-1José Padilla
Changed incorrect class name in pagination docs
2015-03-10Changed incorrect class nameBryan Alsdorf
2015-03-09Fixed a typo in the documentation's link.Xavier Ordoquy
2015-03-09Merge pull request #2652 from jpadilla/masterTom Christie
Remove the 'docs for 3.0' banners.
2015-03-09Merge pull request #2655 from jwbixby/patch-1Tom Christie
Update documentation over PAGE_SIZE
2015-03-09Merge pull request #2658 from ddx/cursorpagination-docs-typoTom Christie
Fixed missing word in CursorPagination docs
2015-03-09Fixed missing word in CursorPagination docsDeven Xie
2015-03-08Merge pull request #2637 from ↵Carlton Gibson
mdentremont/topic/allow-serialize-unsaved-with-relations Support serializing unsaved models with related fields.
2015-03-08Update documenation over PAGE_SIZEjwbixby
This replaces all locations of the old setting `DEFAULT_PAGE_SIZE` for the current setting `PAGE_SIZE`
2015-03-07Update to 3.1 releaseJosé Padilla
2015-03-07Remove docs for 3.0 bannersJosé Padilla
2015-03-07Fix permissions on markdown filesJosé Padilla
2015-03-07update vertical and inline layouts for radio choicesAider Ibragimov
2015-03-06Merge pull request #2640 from Crystalnix/fix-remove-mergedictJosé Padilla
Remove `MergeDict`
2015-03-06Add support for serializing models with m2m related fieldsMatt d'Entremont
- In both ManyRelatedField, provide an empty return when trying to access a relation field if the instance in question has no PK (so likely hasn't been inserted yet) - Add relevant tests - Without these changes, exceptions would be raised when trying to serialize the uncreated models as it is impossible to query relations without a PK - Add test to ensure RelatedField does not regress as currently supports being serialized with and unsaved model
2015-03-06Merge pull request #2643 from jpadilla/masterTom Christie
Fix customizing field mappings link
2015-03-06Fix customizing field mappings linkJosé Padilla
2015-03-06Better docs linkingTom Christie
2015-03-06More docs on cursor pagination3.1.0Tom Christie
2015-03-06Tweaks for cursor pagination and docsTom Christie