aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/renderers.py
AgeCommit message (Collapse)Author
2013-02-04Merge branch 'py3k' into 2.2Tom Christie
Conflicts: rest_framework/relations.py rest_framework/serializers.py rest_framework/tests/relations_hyperlink.py rest_framework/tests/relations_slug.py
2013-02-04Use request.QUERY_PARAMS internallyTom Christie
(instead of request.GET)
2013-02-01Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into ↵Tom Christie
working Conflicts: rest_framework/authentication.py rest_framework/relations.py rest_framework/serializers.py rest_framework/settings.py rest_framework/tests/authentication.py rest_framework/tests/genericrelations.py rest_framework/tests/generics.py rest_framework/tests/relations_hyperlink.py rest_framework/tests/relations_nested.py rest_framework/tests/relations_pk.py rest_framework/tests/serializer.py
2013-01-30Merge branch 'master' into many-fieldsTom Christie
Conflicts: rest_framework/relations.py
2013-01-30Use many=True style for pk relations.Tom Christie
2013-01-05deprecate simplejsonJuan Riaza
2013-01-02Merge remote-tracking branch 'reference/py3k' into p3kXavier Ordoquy
2012-12-17Fix bug with M2M in browseable APITom Christie
2012-12-04fixed #469 - RegexField <--> BrowsableAPI BugStephan Groß
2012-12-02Merge remote-tracking branch 'reference/master' into p3kXavier Ordoquy
2012-12-02Fixed a bug with type and python 2.x compat.Xavier Ordoquy
2012-12-02trunk bug.Xavier Ordoquy
2012-11-29Merge branch 'custom-serializer-form-class' of ↵Marko Tibold
https://github.com/ludwigkraatz/django-rest-framework into mergebranch#390 Conflicts: rest_framework/fields.py rest_framework/renderers.py Manually solved
2012-11-22First passing test under p3k \o/Xavier Ordoquy
2012-11-21Tweak to work with serializer performance improvementTom Christie
2012-11-21added RegexField to field_mapping in BrowsableAPIRendererStephan Groß
2012-11-19Merge pull request #429 from minddust/minor_fixesTom Christie
updated to buildin status codes
2012-11-19updated to buildin status codesStephan Groß
2012-11-15Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into ↵Marko Tibold
file_and_image_fields
2012-11-14fixed some typosStephan Groß
2012-11-14Properly render file inputs in the Browsable api.Marko Tibold
2012-11-08Fields specify what FormFieldClass should be used by BrowsableApiRendererLudwig Kraatz
added SerializerField Attribute "form_field_class" and defaults for existing Fields
2012-11-08Allowing custom Serializer Fields to have different BrowsableApiRendered ↵Ludwig Kraatz
Form Fields than CharField moved field_mapping from local serializer_to_form_fields var to BrowsableAPIRenderer class attr
2012-11-08moved field_mapping to be BrowsableAPIRenderer attrLudwig Kraatz
from local serializer_to_form_fields var to BrowsableAPIRenderer class attr in order to - allow customization when subclassing
2012-11-06Support for HTML error templates. Fixes #319.Tom Christie
2012-11-04Fix for bug #363: ChoiceField missing in renderers.pyMichael Shepanski
2012-11-01Merge masterTom Christie
2012-11-01Relational field support in browseable API.Tom Christie
Add slug relational fields. Add quickstart.
2012-11-01return choices as unicode and not string,Pavel Savchenko
might as well have jsonp return unicode
2012-10-30Final docs tweaks for 2.0Tom Christie
2012-10-28readonly -> read_onlyTom Christie
2012-10-28TemplateHTMLRenderer, StaticHTMLRendererTom Christie
2012-10-26Object-level permissions respected by Browseable APITom Christie
2012-10-22Merge commit '95a670de41a246777bc1e448dca8cc576b7b86ea' into ↵Marko Tibold
BrowsableAPIRenderer Conflicts: rest_framework/renderers.py - manually resolved conflict
2012-10-21Refactoring BrowsableAPIRendererMarko Tibold
2012-10-21Remove redundant check if method=='DELETE'Marko Tibold
2012-10-21Remove `initial` kwarg, add `default`.Tom Christie
2012-10-19Fix up widget choicesTom Christie
2012-10-19Drop help_textTom Christie
2012-10-18First pass at pastebin tutorialTom Christie
2012-10-17Added `media_type` to `.parse()` - Consistency with renderer API.Tom Christie
2012-10-15Explicit CSRF failure message. Fixes #60.Tom Christie
2012-10-15Tweak parsers to take parser_contextTom Christie
2012-10-10Fix yaml renderingTom Christie
2012-10-10Fix key ordering in json. (sort if it's a sorted dictc representation, or ↵Tom Christie
not otherwise)
2012-10-10Make sure JSON output in Browseable API is nicely indentedTom Christie
2012-10-09Rename HTMLTemplateRenderer -> HTMLRenderer, DocuemntingHTMLRenderer -> ↵Tom Christie
BrowseableAPIRenderer
2012-10-08Adding migration and changelog docsTom Christie
2012-10-05HTMLTemplateRenderer workingTom Christie
2012-10-05Tidy up renderers slightlyTom Christie