Commit Graph

12 Commits

Author SHA1 Message Date
Jens Alm
b6913c516b Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2011-10-01 12:59:32 +02:00
Tom Christie
249eb6f931 Make sure to check for "is not None" so that depth=0 gets assigned properly. Thanks thomasst. 2011-09-29 19:47:20 +02:00
Jens Alm
dec5ac8887 Fixed commit errors
Signed-off-by: Jens Alm <jens.alm@mac.com>
2011-08-14 01:57:38 +02:00
Jens Alm
e7f2242cfd Merge branch 'master' of github.com:ulmus/django-rest-framework
Conflicts:
	djangorestframework/serializer.py

Signed-off-by: Jens Alm <jens.alm@mac.com>
2011-08-14 01:56:15 +02:00
Jens Alm
2fd7cea6a3 Sending request into serialize functions
Signed-off-by: Jens Alm <jens.alm@mac.com>
2011-08-14 01:54:27 +02:00
Jens Alm
c59a37b0a6 Sending request into serialize functions
Signed-off-by: Jens Alm <jens.alm@mac.com>
2011-08-14 01:08:19 +02:00
Sébastien Piquemal
11ee385743 fixed a bug in serializers 2011-07-06 14:18:48 +03:00
Sébastien Piquemal
3161475562 debugged serializers 2011-07-04 11:31:46 +03:00
Tom Christie
8d51759dd1 Fix bitbucket issue 39. All further issues should be on github 2011-07-01 12:29:42 +01:00
Tom Christie
82de0cf50a Decimals are a protected_type - let's leave them up to the renderer to deal with 2011-06-21 23:01:41 +01:00
Tom Christie
7dcb851c7f Allow related models to be fully serialized 2011-06-15 14:09:01 +01:00
Tom Christie
412b5fc2d5 Support for nesting resources etc...
--HG--
rename : djangorestframework/tests/resources.py => djangorestframework/tests/serializer.py
2011-06-14 18:22:13 +01:00