2709 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	9b56616750	Merge	2013-03-26 08:59:40 +00:00
Tom Christie	92c929094c	Version 2.2.5	2013-03-26 07:48:53 +00:00
Tom Christie	8387cb5d16	Docs fix	2013-03-25 20:28:17 +00:00
Tom Christie	7eefcf7e53	Bulk update, allow_add_remove flag	2013-03-25 20:26:34 +00:00
Tom Christie	f82db5521e	Merge branch 'master' of https://github.com/tomchristie/django-rest-framework	2013-03-25 17:30:32 +00:00
Tom Christie	dca24cd914	Added @stoneg for typo fix #754. Thank you!	2013-03-25 16:44:36 +00:00
Tom Christie	4840eb27d7	Merge pull request #754 from stoneG/master ... Just a tiny typo	2013-03-25 09:29:51 -07:00
Sitong Peng	dab158e1fd	Tiny typo	2013-03-25 09:27:12 -07:00
Matteo Suppo	b5640bb778	Forcing translations of lazy translatable strings in Field to_native method	2013-03-23 14:18:55 +01:00
Matteo Suppo	0081d744b9	Added tests for issue 747 in serializer.py	2013-03-23 14:18:11 +01:00
Tom Christie	6111dcef52	Update release notes	2013-03-22 22:58:04 +00:00
Tom Christie	9fdb661c59	Merge pull request #749 from tomchristie/clean-basic-nested-serialization ... Clean basic nested serialization	2013-03-22 15:29:59 -07:00
Tom Christie	addf7e9b36	Defer the writable nested modelserializers work	2013-03-22 22:27:03 +00:00
Tom Christie	9cdf841169	Tweaking	2013-03-22 22:11:30 +00:00
Tom Christie	fe82982ff2	Merge master	2013-03-22 22:09:49 +00:00
Tom Christie	624ce250cd	Updating contribution docs (still wip)	2013-03-22 22:06:38 +00:00
Tom Christie	9bf7c9b714	Merge master	2013-03-22 21:57:37 +00:00
Tom Christie	870d5c7d78	Merge pull request #744 from tomchristie/basic-bulk-edit ... Basic bulk create and bulk update	2013-03-22 14:47:29 -07:00
Tom Christie	9a2ba4bf54	Update release notes	2013-03-22 21:37:51 +00:00
Tom Christie	4055129662	If oauth is not attempted don't throw an error. Fixes #748.	2013-03-22 21:31:50 +00:00
Tom Christie	6770a5bbaf	Merge pull request #743 from tomchristie/fix-datetime-regression ... Fix datetime regression	2013-03-22 14:26:06 -07:00
Tom Christie	13794baf70	Bit of extra tidying and plenty of docs	2013-03-22 17:01:06 +00:00
Tom Christie	b4210f9a56	Test moved out of serializer.py into serializer_bulk_update	2013-03-22 12:46:03 +00:00
Tom Christie	c32d9969ac	Add extra tests for errors from incorrect data with multiple create/update	2013-03-22 12:33:09 +00:00
Tom Christie	8adde506e8	Default date/time fields now return python date/time objects again by default	2013-03-21 08:41:54 +00:00
Tom Christie	20fd738c85	iso formated datetime aware fields with +0000 offset should use 'Z' suffix instead	2013-03-20 13:05:59 +00:00
Tom Christie	b2dc664485	Basic bulk create and bulk update	2013-03-19 14:26:48 +00:00
Tom Christie	deb5e653e4	Added bulk create tests	2013-03-18 21:35:06 +00:00
Tom Christie	ad3ffe20f0	Merge branch 'master' into basic-nested-serialization	2013-03-18 21:12:05 +00:00
Tom Christie	09e4ee7ae3	Remove dumbass unneeded test	2013-03-18 21:11:40 +00:00
Tom Christie	922ee61d86	Remove erronous pre_save	2013-03-18 21:05:13 +00:00
Tom Christie	74fb366c59	Merge branch 'master' into resources-routers	2013-03-18 21:03:05 +00:00
Tom Christie	75fbfb5858	Merge pull request #739 from craigds/basic-nested-serialization ... tweaks to writable nested serializers	2013-03-18 01:00:17 -07:00
Craig de Stigter	101fa26ebc	use writablefield style for serializer handling of self.default	2013-03-18 16:05:34 +13:00
Craig de Stigter	d6d5b1d82a	allow default values in writable serializer fields	2013-03-18 14:50:21 +13:00
Craig de Stigter	c8416df0c4	accept all WritableField kwargs for writable serializers (eg required=True)	2013-03-18 14:27:15 +13:00
Tom Christie	034c4ce408	Fix serializer restore_object example for partial updates	2013-03-17 20:06:38 +00:00
Tom Christie	ef0caf64d3	Extra note on method	2013-03-17 19:59:13 +00:00
Tom Christie	e80d3d1bdf	Fix text regarding serializer error messages. ... Closes #734.	2013-03-17 19:51:04 +00:00
Tom Christie	ee20cf806b	Merge pull request #735 from tomchristie/one-to-one-nested-wip ... One to one writable nested model serializers (wip)	2013-03-16 00:41:54 -07:00
Tom Christie	66bdd608e1	Fixes to save_object	2013-03-16 07:35:44 +00:00
Tom Christie	3ff103ad04	Fixes to save_object	2013-03-16 07:35:27 +00:00
Tom Christie	ccf551201f	Clean up and comment restore_object	2013-03-16 07:32:50 +00:00
Tom Christie	56653111a6	Remove unneeded arguments to save_object	2013-03-15 19:57:57 +00:00
Tom Christie	32e0e5e18c	Remove erronous _delete attribute	2013-03-15 19:55:32 +00:00
Tom Christie	5f5b22d86f	Merge branch 'basic-nested-serialization' into one-to-one-nested-wip	2013-03-15 19:32:30 +00:00
Tom Christie	1aedf57f4a	Merge branch 'master' into basic-nested-serialization	2013-03-15 19:25:12 +00:00
Tom Christie	47492e3ef4	Clean out ModelSerializer special casing from Serializer.field_from_native	2013-03-15 19:22:31 +00:00
Tom Christie	fb3b57803f	one 2 one nested relationships	2013-03-15 19:17:54 +00:00
Tom Christie	22a389d0ba	Better titles & descriptions	2013-03-15 13:41:22 +00:00