aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
AgeCommit message (Collapse)Author
2014-08-19Code linting and added runtests.pyTom Christie
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
override_method should substitute action
2014-08-18Merge pull request #1505 from ticosax/test.client.logoutTom Christie
reset stored credentials when call client.logout()
2014-08-18Merge pull request #1641 from javins/login-titleTom Christie
Refactor login template to extend base.
2014-08-18Merge pull request #1726 from ikame/masterTom Christie
Leave status responsibility to parent class
2014-08-18Merge pull request #1654 from carltongibson/1559-take-2Tom Christie
Allow use of native migrations in 1.7 — Take 2
2014-08-18Merge pull request #1772 from tomchristie/fix-1583Tom Christie
Copy filter_backends class attribute before returning it.
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
Issue #1707: Add documentation to api-docs.viewsets
2014-08-18Merge pull request #1739 from kevinlondon/patch-3Tom Christie
Updated documentation for urls.py
2014-08-16Fixed action_map being pulled from wrong objectAndrew Fong
2014-08-16override_method should substitute actionAndrew Fong
A view's action is dependent on the request method. When overriding the method (e.g. to generate a form for a POST request on a GET call to the browseable API), the action should be updated as well. Otherwise, viewset functions may be in a weird limbo state where a 'list' action has a POST method.
2014-08-16Add test for SerializerMethodFieldAymeric Derbois
2014-08-13ModelSerializer.restore_object - errors as listJohn Whitlock
When a ValueError is raised in ModelSerializer.restore_object, the error is set to a one-element list, rather than a bare string.
2014-08-11Refactor JSONRenderer slightly for easier overridingTom Christie
2014-08-07Updated documentation for urls.pyKevin London
I made a small change in the order of the documentation for urls.py. I feel it helps make it clear which lines you should add to the root settings.
2014-08-06Update description of OrderingFilterKevin London
I added a brief description of how you could specify a different query parameter for the OrderingFilter.
2014-08-05Remove duplicate class attributesJason Alan Palmer
These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style
2014-08-01Leave status responsibility to parent classAnler Hp
Django's `HttpResponse` class checks for the `status` param when it's initialized, if it's `None` it uses the class attribute `status_code` and thanks to that we can do things like: ``` class BadRequest(HttpResponse): status_code = 400 ``` Now, that doesn't work when inheriting from rest-framework's `Response`: ``` class BadRequest(rest_framework.response.Response): status_code = 400 # Bad, it's always ignored ``` Because a default status of `200` is being specified in `rest_framework.response.Response`. I think is more Django-friendly to just leave that status default value to `None` and leave the responsibility of choosing its value to the parent class: `HttpResponse`.
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
to the `queryset` property, `get_queryset()`, and do generic-views.md; remove changes to the viewsets.md documentation from my last commit.
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
Conflicts: rest_framework/fields.py
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
Conflicts: docs/topics/release-notes.md
2014-06-24Added (first pass) notes to docs & release notes. Backed out ↵Carlton Gibson
`SOUTH_MIGRATION_MODULES` setting from `rest_framework.settings`
2014-06-23Allow use of native migrations in 1.7Carlton Gibson
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini
2014-06-16typo in the docsTankorSmash
2014-06-13Refactor login template to extend base.Walt Javins
While experimenting with extending DRF, I found that the login page 1) had no title, and 2) duplicated <head> info from base.html. This change adds a new {% block body %} to the base.html template which allows override of the entire html <body>. login_base.html has its duplicated head info stripped, and now extends base.html to share common html <head> templating. As part of this change, pretify.css is unnecessarily added to login_base.html. If this is deemed a problem, it will be easy to block that css out, and have login_base.html override the block. Ideally, I would have liked to create a new api_base.html that extends base.html, move the api specific logic into that template, and leave base.html content agnostic, to truely be a unifying base for all DRF pages. But this change would break current apps that override api.html and expect base.html to be the immediate super template. :/ This change is benificial because it: - removes duplication of header declarations (mostly css includes) - adds a html title to the login page - standardizes html header info across all DRF pages Docs are updated to reflect the new structure.
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
If `content_type` is specified in the `APIRequestFactory`, always include it in the request, even if data is empty.
2014-05-26Add the allow_add_remove parameter to the get_serializer methodkhamaileon
2014-05-22Fix _resolve_model to work with unicode stringsPiper Merriam
2014-05-22fields: allow help_text on SerializerMethodFieldJohn Spray
...by passing through any extra *args and **kwargs to the parent constructor. Previously one couldn't assign help_text to a SerializerMethodField during construction.
2014-05-20Merge pull request #1536 from Ian-Foote/choicefield_blank_display_valueTom Christie
Allow customising ChoiceField blank display value
2014-05-19fix pep8allenhu
2014-05-16Added missing import.Xavier Ordoquy
2014-05-16Fixed tests for python 3.4Xavier Ordoquy
2014-05-09Merge pull request #1564 from alumni/masterCarlton Gibson
Fixes #1535 (HTML widget missing `id` attribute)