encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-04 23:44:07 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,964 Commits 18 Branches 132 Tags 105 MiB
6de9b7c8ca
Commit Graph

2964 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
55fd646631 Set many explicitly from mixins. Refs #564. 2013-02-06 13:04:11 +00:00
Tom Christie
cc2ec2bbf0 Tweaks to release notes. 2013-02-06 12:57:59 +00:00
Tom Christie
691a8f682d Note on turning off implicit many behavior. Refs #564. 2013-02-06 12:48:08 +00:00
Tom Christie
4788c87b76 Fix mismatch between template blocks and docs. 
Fixes #639.
 2013-02-06 12:35:05 +00:00
Tom Christie
72fe686623 Merge pull request #636 from tomchristie/2.2 
2.2 Release
 2013-02-06 00:53:41 -08:00
Tom Christie
bdc97c5611 2.2 Release notes (wip) 2013-02-06 08:52:21 +00:00
Tom Christie
3a41773308 Drop 2.0 notice. 2013-02-06 08:48:54 +00:00
Tom Christie
efb798cebc Don't deprecate 'exclude' 
Need to track outcome of Django's #19733, and decide on approach
accordingly.
 2013-02-06 08:48:41 +00:00
Tom Christie
280dfa4343 Remove 2.0 notice on main docs. 2013-02-04 21:45:38 +00:00
Tom Christie
7dc4bce4e2 Fix 2.6 compat 2013-02-04 21:35:47 +00:00
Tom Christie
937ef00808 Merge branch 'master' into 2.2 2013-02-04 21:19:11 +00:00
Tom Christie
221e77d357 Fix incorrect test name. Fixes #635 2013-02-04 21:18:54 +00:00
Tom Christie
0a38bc9db8 Deal with parser encodings properly 2013-02-04 21:16:34 +00:00
Tom Christie
b052c92ac3 Cleanup imports 
Mostly adding `from __future__ import unicode_literals` everywhere.
 2013-02-04 20:55:35 +00:00
Tom Christie
b82227e517 remove broken import 2013-02-04 20:38:18 +00:00
Tom Christie
8e846bdf52 Merge branch 'py3k' into 2.2 
Conflicts:
	rest_framework/relations.py
	rest_framework/serializers.py
	rest_framework/tests/relations_hyperlink.py
	rest_framework/tests/relations_slug.py
 2013-02-04 20:37:09 +00:00
Tom Christie
97f2b99495 Don't use deprecated xml style 2013-02-04 19:51:50 +00:00
Tom Christie
2c634c0e5c Use request.QUERY_PARAMS internally 
(instead of request.GET)
 2013-02-04 19:51:31 +00:00
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