aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.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-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-30Merge branch 'master' into many-fieldsTom Christie
Conflicts: rest_framework/relations.py
2013-01-30Formatting fixesTom Christie
2013-01-03Tweak comment.Tom Christie
2013-01-03Merge pull request #541 from yprez/default_and_partial_serializers2Tom Christie
Fix "default" values and partial serializers. Fixes #532.
2013-01-03Move the various compat things to the compat module.Xavier Ordoquy
2013-01-03Some cleanupYuri Prezument
2013-01-02FileField validation - handle case when files=None, fixes #542Yuri Prezument
2013-01-02urlparse not used here.Xavier Ordoquy
2013-01-02Merge remote-tracking branch 'reference/py3k' into p3kXavier Ordoquy
2013-01-02Add explaining commentYuri Prezument
2013-01-02Fix "default" and partial serializers, fixes #532Yuri Prezument
2012-12-31Relation fields move into relations.pyTom Christie
2012-12-21Update RelatedField#field_from_native coding styleMark Aaron Shirley
2012-12-19Merge remote-tracking branch 'upstream/master' into related-requiredMark Aaron Shirley
2012-12-19Merge pull request #510 from joual/masterTom Christie
Fixes #509
2012-12-19Check if RelatedField is required.Mark Aaron Shirley
2012-12-18WhitespaceTom Christie
2012-12-15Final commit to restore the fixJoel Marcotte
Signed-off-by: Joel Marcotte <skaner@gmail.com>
2012-12-15Reverting commit to previous state to see if the test is only relevant to ↵Joel Marcotte
django 1.5b2
2012-12-15Fix model validation exclusions. Fixes #500. Fixes #506.Tom Christie
2012-12-15Fix for JSON integer match to a ChoiceFieldJoel Marcotte
2012-12-13fixed validationerror usageStephan Groß
2012-12-11Fix broken nested fieldsTom Christie
2012-12-10Making sure the assert does not fail when required=False, read_only=TrueVenkat
2012-12-08Add null related field optionTom Christie
2012-12-08Fix for emptystring as nullable FKTom Christie
2012-12-07Support nullable FKs, with blank=TrueTom Christie
2012-12-06Merge pull request #470 from minddust/fix-#469Tom Christie
fixed #469 - RegexField <--> BrowsableAPI Bug
2012-12-04Added support for 'true'/'false' as valid boolean dataMichael Richards
2012-12-04fixed #469 - RegexField <--> BrowsableAPI BugStephan Groß
2012-12-02Merge remote-tracking branch 'reference/master' into p3kXavier 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-2352 tests passing. Refactored a few string / byte io.Xavier Ordoquy
2012-11-22Merge pull request #441 from dbachrach/masterTom Christie
Add widgets for DateField and DateTimeField
2012-11-22First passing test under p3k \o/Xavier Ordoquy
2012-11-21Merge remote-tracking branch 'upstream/master' into partial-updateMark Aaron Shirley
2012-11-21partial argument should override requiredMark Aaron Shirley
2012-11-21Merge remote-tracking branch 'upstream/master' into regex_fieldStephan Groß
Conflicts: docs/topics/release-notes.md
2012-11-20Merge pull request #430 from j4mie/serializer-method-fieldTom Christie
Serializer method field
2012-11-20Add support for partial serializer updatesMark Aaron Shirley
2012-11-20Add widgets for DateField and DateTimeField.Dustin Bachrach
2012-11-20added RegexFieldStephan Groß
2012-11-19Add SerializerMethodFieldJamie Matthews
2012-11-18Add support for min_length / max_length keywordsJacob Magnusson
on basic ModelFields
2012-11-16Merge pull request #422 from markotibold/max_length_for_modelserializersTom Christie
Max length for modelserializers
2012-11-16Added URLField and SlugField.Marko Tibold
Fixed test_modelserializer_max_length_exceeded
2012-11-15Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into ↵Marko Tibold
file_and_image_fields