aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-18add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and ↵Craig de Stigter
HyperlinkedRelatedField. #694
2013-05-18ManyHyperlinkedRelatedField comes form rest_framework.relations nowMarkus Törnqvist
2013-05-18serializers.Field respects ordering on dicts if it exists. Closes #832Tom Christie
2013-05-18Use smart_text() instead of nonexistant smart_unicode()Markus Törnqvist
2013-05-18Merge branch 'mikee2185-master' into mjtorn-masterMarkus Törnqvist
Conflicts: rest_framework/fields.py rest_framework/serializers.py rest_framework/tests/models.py rest_framework/tests/serializer.py Fixed all the conflicts.
2013-05-18add tests for related field source for HyperlinkedRelatedField. #694Craig de Stigter
2013-05-18add tests for related field source for RelatedField and ↵Craig de Stigter
PrimaryKeyRelatedField. #694
2013-05-18Updated the dependencies version and added the ALLOWED_HOSTS for tests.Xavier Ordoquy
2013-05-18Merge pull request #850 from tomchristie/dynamic-formsTom Christie
Forms in Broseable API support dynamic serializers based on request method
2013-05-18Forms in Broseable API support dynamic serializers based on request methodTom Christie
2013-05-18Merge remote-tracking branch 'upstream/master'Craig de Stigter
2013-05-17Minor mixin refactoringTom Christie
2013-05-17Fix PendingDeprecation warnings in testsTom Christie
2013-05-17PendingDeprecation warning to allow_emptyTom Christie
2013-05-17Merge pull request #847 from johtso/patch-1Tom Christie
Fix typo + grammar in viewsets docs
2013-05-17Fix typo + grammar in viewsets docsJohannes
2013-05-16Updated README.mdMichael Elovskikh
2013-05-16Update release-notes.mdTom Christie
2013-05-16Added @rouge8 for bugfix #844. Thank you!Tom Christie
2013-05-16Merge pull request #844 from rouge8/hyperlinkedidentityfield-lookup_fieldTom Christie
HyperlinkedIdentityField uses `lookup_field` kwarg.
2013-05-16HyperlinkedIdentityField uses `lookup_field` kwarg.Andy Freeland
According to the [Serializers API Guide][1], `HyperlinkedIdentityField` takes `lookup_field` as a kwarg like the other related fields and the generic views. However, this was not actually implemented. [1]: http://django-rest-framework.org/api-guide/serializers.html#hyperlinkedmodelserializer
2013-05-16Merge branch 'master' of https://github.com/tomchristie/django-rest-framework2.3.3Tom Christie
2013-05-16Version 2.3.3Tom Christie
2013-05-16Merge pull request #843 from linovia/masterTom Christie
Small typo in the ViewSet example.
2013-05-16Small typo in the ViewSet example.Xavier Ordoquy
2013-05-15Test and fix which closes #652.Tom Christie
2013-05-15Fix searchfilter issuesTom Christie
2013-05-14Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-05-14Base automatic filterset model on the queryset model. Fixes #834.Tom Christie
2013-05-14Added @jsummerfield for cleanups in #824. Thanks!Tom Christie
2013-05-14Merge pull request #824 from jsummerfield/patch-1Tom Christie
Remove trailing unmatched </div> in login_base.html template. Reformat i...
2013-05-14Fix assert messaging on fields/exclude checking. Closes #833Tom Christie
2013-05-14Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-05-14Added @avinash240 for bugfix #822Tom Christie
2013-05-14Updated release notesTom Christie
2013-05-14Fix filter test renamingTom Christie
2013-05-14Merge branch 'master' of https://github.com/avinash240/django-rest-frameworkTom Christie
2013-05-14Added OrderingFilterTom Christie
2013-05-14Added OrderingFilterTom Christie
2013-05-14Rename filter testsTom Christie
2013-05-14More docs on SearchFilterTom Christie
2013-05-14SearchFilter may be comma and/or whitespace seperatedTom Christie
2013-05-14Fix Django 1.3 compat with routersTom Christie
2013-05-14Updated release notesTom Christie
2013-05-13Allow for missing non-required nested objects.Brian Zambrano
Serializer fields which are themselves serializers should not be required. Specifically, if a nested object is set to "required=False", it should be possible to serialize the main object and have the sub-object set to None/null.
2013-05-13Added django-viewsets to credits. Refs #738.Tom Christie
2013-05-13Remove trailing unmatched </div> in login_base.html template. Reformat ↵James Summerfield
indentation and label all closing tags for consistency.
2013-05-12fix test case to work with Python 3 and make it more explicitMarlon Bailey
2013-05-11added support for multiple @action and @link decorators on a viewset, along ↵Marlon Bailey
with a router testcase illustrating the failure against the master code base
2013-05-10Fix py3k compat with functools.reduceTom Christie