aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-23Try to resolve pep8 versioning clash.Tom Christie
2015-03-23Downgrade pep8 requirement, due to versioning clashTom Christie
2015-03-23Update flake8 dependancyTom Christie
2015-03-23TypoTom Christie
2015-03-23Fix release dateTom Christie
2015-03-23Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2015-03-23Add 3.1.x series headerTom Christie
2015-03-23Merge pull request #2724 from delinhabit/namespaced-versioning-non-api-reversalTom Christie
Handle reversal of non-API view_name in HyperLinkedRelatedField
2015-03-23Latest translation strings3.1.1Tom Christie
2015-03-23Update release notesTom Christie
2015-03-23Merge pull request #2726 from linovia/release/3.1.1Tom Christie
Release notes for 3.1.1 and version bump.
2015-03-23Escape tab switching cookieTom Christie
2015-03-23Merge pull request #2743 from maurodoglio/serializer_class-html-rendererTom Christie
Use `serializer_class` for browsable API display, even on plain APIView.
2015-03-22Make BrowsableAPIRenderer use serializer_class when presentmdoglio
2015-03-22Set serializer_class on ObtainAuthToken viewmdoglio
2015-03-22Merge pull request #2741 from maurodoglio/hide-authtoken-fieldTom Christie
AuthTokenSerializer - properly render password field
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-19Handling the fallback in `reverse`Ion Scerbatiuc
2015-03-19Release notes for 3.1.1 and version bump.Xavier Ordoquy
2015-03-19Handle reversal of non-API view_name in HyperLinkedRelatedFieldIon Scerbatiuc
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