aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
AgeCommit message (Collapse)Author
2014-09-12Clean up relational fields queryset usageTom Christie
2014-09-12to_internal_value() and to_representation()Tom Christie
2014-09-12MethodField -> SerializerMethodFieldTom Christie
2014-09-11DecimalFields should still be quantized even without coerce_to_stringTom Christie
2014-09-11NotImplemented stubs for Field, and DecimalField improvementsTom Christie
2014-09-11Merge masterTom Christie
2014-09-10Compat fixesTom Christie
2014-09-10Added help_text argument to fieldsTom Christie
2014-09-10TweaksTom Christie
2014-09-09Fleshing out serializer fieldsTom Christie
2014-09-08More test sortingTom Christie
2014-09-06Fixed #1533 - Resolved issue with integer keys on nested choices never ↵Christopher Adams
validating. - Added unit test for nested `choices` argument. - Added unit test for non-nested `choices` argument.
2014-09-05Workin onTom Christie
2014-09-05Use Serializer instead of ModelSerializerPiotr Jakimiak
2014-09-05Fix commentPiotr Jakimiak
2014-09-05Fix returning None when allow_none is True in CharFieldPiotr Jakimiak
2014-09-02Getting tests passingTom Christie
2014-09-02Add relations and get tests runningTom Christie
2014-08-29First passTom Christie
2014-08-19Drop six from compat. 1.4.2 is now the lowest supported version.Tom Christie
2014-08-19Resolve linting issuesTom Christie
2014-07-26Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: rest_framework/fields.py
2014-06-27Merge branch 'master' into modelserialization-charfield-with-nullSerhiy Voyt
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-05Replace ChoiceField type_labelkhamaileon
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-09Merge pull request #1564 from alumni/masterCarlton Gibson
Fixes #1535 (HTML widget missing `id` attribute)
2014-05-08Merge pull request #1575 from ewdicus/iso8601Carlton Gibson
Add colon to time zone offset in readable_datetime_formats
2014-05-07Add colon to time zone offset in readable_datetime_formatsElliott
2014-05-07In case of None value returns empty string instead of NoneType.Serhiy Voyt
2014-05-06Charfied from_native method returns default instead of None. Updated tests.Serhiy Voyt
2014-05-04Automatically set the field name as value for the HTML `id` attribute on the ↵Lucian Mocanu
rendered widget.
2014-04-30Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py
2014-04-27Minor typoKamil Niski
2014-04-16Allow customising ChoiceField blank display valueIan Foote
2014-04-13Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini
2014-04-07Fixed comment.Mauro de Carvalho
2014-02-27RelatedField default value handling fixedAnton Shutik
2014-02-11Test and fix for #1210. World's lowest hanging fruit.Carlton Gibson
2014-01-15Nicer write_only fields implementation. Closes #1355Tom Christie
2014-01-14Added write_only and write_only_fields. Refs #1306Tom Christie
2014-01-12CharField - add allow_null argumentYuri Prezument
2014-01-12Possible fix for #1330Yuri Prezument
Coerce None to '' in CharField.to_native()
2013-12-23Merge branch 'bennbollay-patch-1' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini
2013-12-13Fix default values always being False for browsable APIKevin Brown
This fixes a bug that was introduced in 28ff6fb [1] for the browsable API, specifically with how it handled default values for boolean fields. Previously, it had a global default for boolean fields set to `False`, which was different than the standard None that was used elsewhere. Because this only needed to be done for the browsable API, a fix was put into place that only set the default to `False` when form data was passed into the serializer. This had the unintended side effect of overriding any default set on the boolean field. This fixes #1101 [2] by only overriding the default if the default is `None`, which is the default for all fields. [1]: https://github.com/tomchristie/django-rest-framework/commit/28ff6fb1ec02b7a04c4a0db54885f3735b6dd43f [2]: https://github.com/tomchristie/django-rest-framework/issues/1101
2013-12-13Merge branch 'master' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py
2013-12-03Merge pull request #1250 from Ian-Foote/choice_fieldTom Christie
Add choices to options metadata for ChoiceField.
2013-11-27Updated the assertion message of the ImageField.Omer Katz