333 Commits

Author	SHA1	Message	Date
Tom Christie	6db3356c4d	NON_FIELD_ERRORS_KEY setting	2014-09-12 10:21:35 +01:00
Tom Christie	0d354e8f92	to_internal_value() and to_representation()	2014-09-12 09:49:35 +01:00
Tom Christie	adcb64ab41	MethodField -> SerializerMethodField	2014-09-12 09:12:56 +01:00
Tom Christie	ab40780dc2	Tidy up lookup_class	2014-09-11 20:22:32 +01:00
Tom Christie	de301f3b66	Merge master	2014-09-11 13:20:44 +01:00
Tom Christie	80ba047347	Compat fixes	2014-09-10 16:57:22 +01:00
Tom Christie	01c8c0cad9	Added help_text argument to fields	2014-09-10 13:52:16 +01:00
Tom Christie	234369aefd	Tweaks	2014-09-10 08:53:33 +01:00
Tom Christie	b1c07670ca	Fleshing out serializer fields	2014-09-09 17:46:28 +01:00
Tom Christie	21980b800d	More test sorting	2014-09-08 14:24:05 +01:00
Tom Christie	d934824bff	Workin on	2014-09-05 16:29:46 +01:00
Tom Christie	f2852811f9	Getting tests passing	2014-09-02 17:41:23 +01:00
Tom Christie	ec096a1cac	Add relations and get tests running	2014-09-02 15:07:56 +01:00
Timo Tuominen	e437520217	Generator implementation of class mapping.	2014-09-01 17:02:48 +03:00
Timo Tuominen	582f6fdd4b	Add utility function to match classes in dictionary.	2014-09-01 15:54:33 +03:00
Timo Tuominen	ae84b8b0e8	Traverse the method resolution order when mapping serializer fields.	2014-09-01 15:03:39 +03:00
Timo Tuominen	82d4b20832	Add subclass matching to serializer field mapping.	2014-09-01 15:02:49 +03:00
Tom Christie	4ac4676a40	First pass	2014-08-29 16:46:26 +01:00
Tom Christie	63d02dbea8	Drop six from compat. 1.4.2 is now the lowest supported version.	2014-08-19 17:06:55 +01:00
Tom Christie	bf09c32de8	Code linting and added runtests.py	2014-08-19 13:28:07 +01:00
Tom Christie	e385a7b8eb	Merge master	2014-08-19 10:11:10 +01:00
John Whitlock	34c1da3515	ModelSerializer.restore_object - errors as list ... When a ValueError is raised in ModelSerializer.restore_object, the error is set to a one-element list, rather than a bare string.	2014-08-13 15:31:25 -05:00
Xavier Ordoquy	2489e38a06	Merge remote-tracking branch 'origin/master' into 2.4.0 ... 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-23 14:02:45 +02:00
Piper Merriam	807f7a6bb9	Fix _resolve_model to work with unicode strings	2014-05-22 15:18:51 -06:00
allenhu	a1a3ad7639	fix pep8	2014-05-19 09:53:05 +08:00
Xavier Ordoquy	5c12b07681	Added missing import.	2014-05-16 19:40:02 +02:00
Xavier Ordoquy	56b4390316	Merge remote-tracking branch 'origin/master' into 2.4.0 ... Conflicts: .travis.yml rest_framework/serializers.py rest_framework/tests/test_authentication.py	2014-04-30 22:21:26 +02:00
Emanuele Pucciarelli	f54399ea77	Merge remote-tracking branch 'upstream/master' ... Conflicts: rest_framework/tests/models.py	2014-04-29 21:41:53 +02:00
Sergey Sinitsyn	a6e525cf3a	Add help_text and verbose_name attribute mapping for related field	2014-04-24 15:58:53 +06:00
Ian Foote	853c7a16c1	Use setattr for adding fields to a new instance ... Add test for restoring a GenericForeignKey	2014-04-13 17:33:45 +01:00
Xavier Ordoquy	d08536ad9d	Merge remote-tracking branch 'origin/master' into 2.4.0 ... 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-13 00:05:57 +02:00
Ian Foote	0a0e4f22e7	Set GenericForeignKey fields on object before save ... * A model with a required GenericForeignKey can be saved if the field is set	2014-04-12 17:51:02 +01:00
Xavier Ordoquy	73cd4e236f	Merge pull request #1477 from vlastv/patch-1 ... Writable star source with instance	2014-03-31 07:49:23 +02:00
Emanuele Pucciarelli	ab5082d15c	Do not check model_field's attributes if it is None	2014-03-28 19:42:46 +01:00
Emanuele Pucciarelli	04315c12af	Use help_text, verbose_name, editable attributes for related fields	2014-03-24 19:25:28 +01:00
Tom Christie	58cae22970	Merge pull request #1474 from elmehdikarami/master ... Update serializers.py	2014-03-20 16:08:10 +00:00
Vladislav Vlastovskiy	e8167f96e6	Fixed copy-paste	2014-03-20 08:53:41 +04:00
Vladislav Vlastovskiy	c3aa10e589	Moved get component from object after test source is star	2014-03-20 01:50:40 +04:00
elmkarami	499d3cb8f0	Update serializers.py	2014-03-19 17:23:15 +00:00
elmkarami	03f96988ba	Update serializers.py ... Prevent iterating over a string that is supposed to be an iterable <==> Prevent read_only_fields = ('some_string)	2014-03-19 17:11:44 +00:00
elmkarami	5c87db96c5	Update serializers.py ... Prevent iterating over a string that is supposed to be an iterable <==> Prevent read_only_fields = ('some_string)	2014-03-19 15:41:25 +00:00
Xavier Ordoquy	51e6982397	Fixed the validation for optional fields that have a value.	2014-03-06 21:18:37 +01:00
Rodolfo Carvalho	94fe03779b	Fix typo	2014-03-05 17:01:54 +01:00
Carlton Gibson	95670933d7	Test and quick fix for #1257	2014-02-11 14:44:56 +01:00
juroe	b182b9e246	Fixes typo (Implicit instead of Implict).	2014-02-04 11:56:41 +01:00
Tom Christie	e9fda70b4a	Nicer write_only fields implementation. Closes #1355	2014-01-15 08:53:23 +00:00
Tom Christie	8f6983ee6e	Merge branch 'master' of git://github.com/sprymak/django-rest-framework into sprymak-master	2014-01-14 20:35:26 +00:00
Tom Christie	85d74fc86a	Added write_only and write_only_fields. Refs #1306	2014-01-14 11:25:44 +00:00
S.Prymak	e9b0d70f5d	Override HyperlinkedModelSerializerOptions url field name with URL_FIELD_NAME setting	2014-01-14 10:38:49 +02:00
Tom Christie	bc6c5df109	Minor tweaks	2014-01-13 17:39:22 +00:00