aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/relations.py
AgeCommit message (Collapse)Author
2013-02-04remove broken importTom Christie
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-013.2, 3.3 compatTom Christie
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-30Add dprecation warningsTom Christie
2013-01-30Tweak empty list implementationTom Christie
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-29Fix processing of ManyToManyField when it is emptyFernando Rocha
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
2013-01-18Starting migration from ManyField to Field(many=True)Tom Christie
2013-01-18Raise Validation Errors when relationships receive incorrect types. Fixes #590.Tom Christie
2013-01-16Drop bits of relations_slug tests which don't mirror existing tests.Tom Christie
2013-01-08Merge remote-tracking branch 'upstream/master' into null-one-to-oneMark Aaron Shirley
2013-01-08Fix inconsistent view_name logic. Fixes #567.Tom Christie
2013-01-07Use ResolveMatch.view_name so namespaces work.Marc Tamlyn
2013-01-04Handle ObjectDoesNotExist exceptions when serializing null reverse one-to-oneMark Aaron Shirley
2013-01-04Add proper validation for updating relational fields with incorrect types. ↵Tom Christie
Fixes #446.
2013-01-03Fix for #446. Note: Also needs applying to other relational types.Tom Christie
2013-01-03Tweak behavior of hyperlinked fields that include an explicit format suffix.Tom Christie
2013-01-03Move the various compat things to the compat module.Xavier Ordoquy
2013-01-02Move the urlparse lib compatibility to the compat file.Xavier Ordoquy
2013-01-02Merge remote-tracking branch 'reference/py3k' into p3kXavier Ordoquy
2012-12-31Relation fields move into relations.pyTom Christie