Commit Graph

3896 Commits

Author SHA1 Message Date
Tom Christie
b9f1fbb5d2 Added @xordoquy for the incredible py3k work!
Commiter number 100!
2013-02-01 15:10:52 +00:00
Tom Christie
00752dcd2a Py3k cleanup 2013-02-01 15:07:51 +00:00
Tom Christie
f4f237e3ee 3.2, 3.3 compat 2013-02-01 14:03:28 +00:00
Tom Christie
d9c7b1c585 Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into 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-02-01 11:58:55 +00:00
Tom Christie
d9b73e15c8 Serializers take many=<bool> argument. 2013-01-31 17:06:23 +00:00
Tom Christie
f1e665673f Tidying 2013-01-30 20:38:11 +00:00
Tom Christie
e4ac566625 Add dprecation warnings 2013-01-30 20:33:50 +00:00
Tom Christie
e24d29ec05 Tweak empty list implementation 2013-01-30 14:21:18 +00:00
Tom Christie
be6df3ae3c Merge branch 'master' into many-fields
Conflicts:
	rest_framework/relations.py
2013-01-30 13:41:56 +00:00
Tom Christie
8021bb5d50 Added @fernandogrd for bugfix #632. Thanks! 2013-01-30 12:43:52 +00:00
Tom Christie
ce914b03ed Updated release notes. 2013-01-30 12:42:51 +00:00
Tom Christie
9a4d01d687 Formatting fixes 2013-01-30 12:41:26 +00:00
Tom Christie
4601487248 Use many=True style for pk relations. 2013-01-30 12:41:18 +00:00
Tom Christie
2948305b98 Merge pull request #632 from fernandogrd/master
Fix processing of ManyToManyField when it is empty
2013-01-30 04:40:39 -08:00
Fernando Rocha
41364b3be0 Added regretion test for issue #632
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
2013-01-30 09:22:36 -03:00
Fernando Rocha
fceacd830f Fix processing of ManyToManyField when it is empty
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
2013-01-29 18:46:05 -03:00
Tom Christie
1929159db1 Docs tweaks. 2013-01-29 09:15:16 +00:00
Tom Christie
5f065153c3 Added @z4r. Thanks!
For ensuring `django-jsonfield` compatibility, via #629.
2013-01-29 09:10:37 +00:00
Tom Christie
94828f4d1c Merge pull request #629 from z4r/patch-1
Update rest_framework/serializers.py
2013-01-29 01:04:59 -08:00
Tom Christie
54096a19fc Added @swistakm, for docs fix #625. Thanks! 2013-01-28 21:08:53 +00:00
Andrea de Marco
85e6360792 Update rest_framework/serializers.py 2013-01-28 22:08:40 +01:00
Tom Christie
141814585c Update release notes 2013-01-28 12:58:22 +00:00
Tom Christie
a3a06d11cc Ensure model field validation is performed for ModelSerializers with a custom restore_object method. Fixes #623. 2013-01-28 12:56:42 +00:00
Tom Christie
94c4a54bf8 Update release notes. 2013-01-28 12:23:25 +00:00
Tom Christie
17aae6f35c Merge pull request #624 from wronglink/fix_login_page
Login page styles fix. Closes #618. Made with 🍪
2013-01-28 04:22:13 -08:00
Tom Christie
2f14d79f4a Added @wronglink, for docs fixes in #592. Thanks! 2013-01-28 12:18:00 +00:00
Tom Christie
69c8bbd251 Merge pull request #625 from swistakm/master
Fix small mistake in docs.
2013-01-28 04:16:50 -08:00
swistakm
661c8f9ad5 fix mistake in docs 2013-01-28 13:05:52 +01:00
Michael Elovskikh
cb5cc70cba Login page styles fix. Closes #618. Made with 🍪 2013-01-28 18:01:44 +06:00
Tom Christie
8a54426656 Merge pull request #592 from wronglink/docs_patch_method
Added PATCH HTTP method to the docs
2013-01-28 03:41:15 -08:00
Michael Elovskikh
499d6424ae Merge branch 'upstream_master' into docs_patch_method
Conflicts:
	docs/api-guide/authentication.md
2013-01-28 16:26:16 +06:00
Michael Elovskikh
180c94dc44 Undo changes in browsable-api.md and browser-enhancements.md 2013-01-28 15:54:00 +06:00
Tom Christie
3bcd38b7d0 Notes on upgrading and versioning. Fixes #620. 2013-01-28 09:10:23 +00:00
Tom Christie
e682bfa54e Drop unneccessary source= argument. 2013-01-28 08:01:54 +00:00
Tom Christie
896477f650 Added @mktums for docs fix in #621. Thanks! 2013-01-28 07:54:03 +00:00
Tom Christie
b1ae82b498 And link to quickstart. 2013-01-28 07:52:22 +00:00
Tom Christie
b11628f429 Revert comment. 2013-01-28 07:52:04 +00:00
Tom Christie
fdd35cd266 Merge pull request #621 from mktums/patch-1
Update docs/tutorial/1-serialization.md
2013-01-27 23:50:23 -08:00
Tom Christie
a58145e20f Note auto_now, auto_now_add behavior. Refs #622. 2013-01-28 07:46:30 +00:00
Tom Christie
99ef0bcad9 Tweak description of example throttle. 2013-01-28 07:37:15 +00:00
Tom Christie
e649f2ec61 Example custom authentication. Fixes #301. 2013-01-28 07:36:57 +00:00
Tom Christie
cb219fa04f Example custom throttle. Fixes #300. 2013-01-28 07:30:28 +00:00
Tom Christie
84a33b0a1f Example custome permission. Fixes #299. 2013-01-28 07:29:50 +00:00
Mike TUMS
c1dc1860da Update docs/tutorial/1-serialization.md
Update for tutorials (manual serialization) to support HTTP PATCH method (partial update of instance)
2013-01-28 00:32:32 +04:00
Tom Christie
ccb4ef0811 Typo 2013-01-27 19:34:16 +00:00
Tom Christie
d4f38dece4 Fix link to django docs. 2013-01-27 17:32:54 +00:00
Tom Christie
a7479e02fa AJAX, CSRF & CORS documentation 2013-01-27 17:23:56 +00:00
Tom Christie
b5d8f50f9d Merge branch 'master' into many-fields 2013-01-26 21:37:43 +00:00
Tom Christie
a75db4cfb8 Version 2.1.17 2013-01-26 20:59:15 +00:00
Tom Christie
4d43e9f7de Test for custom pagination serializers. Also refs #604. 2013-01-26 20:55:09 +00:00