aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
AgeCommit message (Expand)Author
2014-08-20Merge branch 'master' into set-retry-afterDmitry Mukhin
2014-08-20Fix cache_throttle typoTom Christie
2014-08-19Drop six from compat. 1.4.2 is now the lowest supported version.Tom Christie
2014-08-19Merge pull request #1778 from linovia/bugfix/1398Tom Christie
2014-08-19Resolve python3 linting issueTom Christie
2014-08-19Resolve linting issuesTom Christie
2014-08-19Code linting and added runtests.pyTom Christie
2014-08-19Merged #1398 against 2.4 branch.Xavier Ordoquy
2014-08-19Merge masterTom Christie
2014-08-18Only set .action attribute in override_method if it already existed on the viewTom Christie
2014-08-18Merge pull request #1763 from fongandrew/patch-1Tom Christie
2014-08-18Merge pull request #1505 from ticosax/test.client.logoutTom Christie
2014-08-18Merge pull request #1641 from javins/login-titleTom Christie
2014-08-18Merge pull request #1726 from ikame/masterTom Christie
2014-08-18Merge pull request #1654 from carltongibson/1559-take-2Tom Christie
2014-08-18Merge pull request #1772 from tomchristie/fix-1583Tom Christie
2014-08-18Copy filter_backends class attribute before returning it.Tom Christie
2014-08-18Always uppercase X-Http-Method-Override methods. Closes #1718.Tom Christie
2014-08-18Merge pull request #1711 from kdazzle/ModelViewSet-queryset-static-propertyTom Christie
2014-08-18Merge pull request #1739 from kevinlondon/patch-3Tom Christie
2014-08-16Fixed action_map being pulled from wrong objectAndrew Fong
2014-08-16override_method should substitute actionAndrew Fong
2014-08-16Add test for SerializerMethodFieldAymeric Derbois
2014-08-13ModelSerializer.restore_object - errors as listJohn Whitlock
2014-08-11Refactor JSONRenderer slightly for easier overridingTom Christie
2014-08-07Updated documentation for urls.pyKevin London
2014-08-06Update description of OrderingFilterKevin London
2014-08-05Remove duplicate class attributesJason Alan Palmer
2014-08-01Leave status responsibility to parent classAnler Hp
2014-07-29Better fix for the Django 1.3 compatXavier Ordoquy
2014-07-29Fixed the Django 1.3 compatXavier Ordoquy
2014-07-29Fixed the cache issue with Django 1.7 rc*Xavier Ordoquy
2014-07-28Issue #1707 - Add documentation about the caching of `GenericAPIView.queryset`Kyle
2014-07-28Merge remote-tracking branch 'reference/master'Xavier Ordoquy
2014-07-28Fix #1712 (issue when django-guardian is installed but not configured/used)Xavier Ordoquy
2014-07-26Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
2014-07-25Updated test docstring related to missing bearer token.Ron Cohen
2014-07-25Sending "Bearer" and "Bearer " resulted in a 500.Ron Cohen
2014-06-27Merge branch 'master' into modelserialization-charfield-with-nullSerhiy Voyt
2014-06-24Merge branch '2.4.0' of github.com:tomchristie/django-rest-framework into #1559Carlton Gibson
2014-06-24Added (first pass) notes to docs & release notes. Backed out `SOUTH_MIGRATION...Carlton Gibson
2014-06-23Allow use of native migrations in 1.7Carlton Gibson
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
2014-06-16typo in the docsTankorSmash
2014-06-13Refactor login template to extend base.Walt Javins
2014-06-12Version 2.3.14Tom Christie
2014-06-08Fixed #1624 (thanks @abraithwaite)Xavier Ordoquy
2014-06-05Replace ChoiceField type_labelkhamaileon
2014-05-30Always use specified content type in APIRequestFactoryDanilo Bargen
2014-05-26Add the allow_add_remove parameter to the get_serializer methodkhamaileon