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
7,030 Commits 18 Branches 132 Tags 105 MiB
a8534baa41
Commit Graph

7030 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
37b4d42488 Merge pull request #3225 from tomchristie/maxpeterson-grouped-choices-fix 
Support grouped choices.
 2015-08-06 13:01:08 +01:00
Tom Christie
33d6d4a420 Test more types of behavior in test_iter_options 2015-08-06 12:30:26 +01:00
Tom Christie
24dec32e7a Added test_iter_options 2015-08-06 12:18:09 +01:00
Tom Christie
4d69286efa Use same structure for both .choices and .grouped_choices 2015-08-06 12:03:38 +01:00
Tom Christie
a6fefe78ff Added docstring 2015-08-06 11:44:39 +01:00
Tom Christie
27ac5a3680 Support grouped choices 2015-08-06 11:43:03 +01:00
Tom Christie
95a1550388 Merge branch 'grouped-choices-fix' of https://github.com/maxpeterson/django-rest-framework into maxpeterson-grouped-choices-fix 2015-08-06 10:04:52 +01:00
Tom Christie
9a778793f8 Adding imports to docs 2015-08-06 09:56:09 +01:00
Tom Christie
bbe5044c04 Merge pull request #3223 from wwj718/patch-1 
import permission_classes
 2015-08-06 09:54:25 +01:00
Tom Christie
38a1b3ec6b Rationalize decimal logic. Closes #3222. 2015-08-06 09:51:00 +01:00
wwj718
c099d9aac4 import permission_classes 
many people don't know how to import permission_classes
 2015-08-06 11:08:56 +08:00
Tom Christie
f7d44dfae0 Loud errors on request.DATA et al. 2015-08-05 17:07:47 +01:00
Tom Christie
6942fa5dab Mask view docstring on 401 and 403 responses. Closes #3216. 2015-08-05 13:59:55 +01:00
Tom Christie
6161ac7d07 Fix parse_html_dict signature. Closes #3212. 2015-08-05 13:45:56 +01:00
Tom Christie
7b51508600 Error on double underscore ordering with CursorPagination. Refs #3221. 2015-08-05 13:42:44 +01:00
Tom Christie
18c9391218 Use shields.io image 2015-08-04 09:47:36 +01:00
Tom Christie
cc5af22dc0 Use 'shilds.io' badge for codecov 2015-08-04 09:45:20 +01:00
Tom Christie
1df5844e67 Merge pull request #3208 from treyhunner/add-codecov 
Report test coverage via Codecov
 2015-08-03 17:13:46 +01:00
Trey Hunner
34c74b8925 Add coverage badge 2015-08-03 08:57:18 -07:00
Cesar Canassa
60c17253ab Add test to check if a 415 status is returned for unsupported media types 2015-08-03 17:54:18 +02:00
Trey Hunner
4cb14d8240 Don't measure branch coverage 2015-08-03 08:39:24 -07:00
Tom Christie
7f80a2e0ad Merge pull request #3211 from tomchristie/Ins1ne-feature/filepathfield 
Add `FilePathField`
 2015-08-03 10:26:37 +01:00
Tom Christie
bf35906dc0 FilePathField subclassing from ChoiceField 2015-08-03 10:17:41 +01:00
Tom Christie
877e964d7e Don't need to support Django 1.4 with FilePathField. 2015-08-03 10:15:28 +01:00
Tom Christie
8d7c0a8474 Merge branch 'feature/filepathfield' of https://github.com/Ins1ne/django-rest-framework into Ins1ne-feature/filepathfield 2015-08-03 10:09:46 +01:00
Tom Christie
650866cc43 Blank relational fields map to required=False serializer fields. Closes #3210. 2015-08-03 09:48:03 +01:00
Tom Christie
472784b70a Docs for custom hyperlinked fields. 2015-08-03 09:27:03 +01:00
Trey Hunner
48b21b6063 Always measure branch coverage 2015-07-31 18:28:49 -07:00
Trey Hunner
5b95536376 Run codecov after success on Travis CI 2015-07-31 18:21:52 -07:00
Tom Christie
9cd455a5a8 Merge pull request #3206 from Ian-Foote/patch-1 
Fix custom HyperlinkedRelatedField example
 2015-07-31 13:03:56 +01:00
Ian Foote
ed55fbe862 Fix custom HyperlinkedRelatedField example 
Fix `get_object` method signature to match [`HyperlinkedRelatedField.get_object`](https://github.com/tomchristie/django-rest-framework/blob/master/rest_framework/relations.py#L227-L236).
 2015-07-31 12:59:50 +01:00
Tom Christie
a543fae180 Merge pull request #2766 from delinhabit/allow-null-list-serializer 
Modify subtle ChildSerializer(many=True, allow_null=True) behavior.
 2015-07-31 10:11:21 +01:00
Tom Christie
9a661f52e5 Merge pull request #3202 from tomchristie/respect-blank-on-many-to-many 
Respect blank on many to many fields.
 2015-07-31 10:01:38 +01:00
Tom Christie
e68d737825 Respect blank on many to many, and set allow_empty=False if it is not present. Closes #2804. 2015-07-30 17:03:08 +01:00
Tom Christie
aa3f844b3d Merge pull request #3199 from tomchristie/remove-url-from-future 
Remove 'load url from future' tags in templates.
 2015-07-30 16:29:11 +01:00
Tom Christie
f087dcf7e2 Merge pull request #3200 from tomchristie/version-3.2 
Version 3.2 deprecations.
 2015-07-30 16:18:59 +01:00
Tom Christie
ad599100bf Merge pull request #3201 from Helioscene/master 
Add package reference to docs: DRY Rest Permissions
 2015-07-30 16:07:25 +01:00
Tom Christie
ed3f9593af Merge branch 'version-3.2' into remove-url-from-future 2015-07-30 16:02:40 +01:00
Tom Christie
1b3b01e042 Remove unused imports 2015-07-30 15:59:27 +01:00
David Kaplan
8d7627a079 Update third-party-resources.md 
Add DRY Rest Framework reference onto the third party resources page.
 2015-07-30 10:51:44 -04:00
David Kaplan
b969e9a872 Update permissions.md 
Add DRY Rest Permissions info to the permissions page
 2015-07-30 10:47:12 -04:00
Tom Christie
c8ad0cce19 Bump minimum Django version to 1.5 2015-07-30 15:43:39 +01:00
Tom Christie
4fd971e3e5 Update exception handler test in line with deprecations 2015-07-30 15:42:11 +01:00
Tom Christie
c203ca4c64 Deprecations 2015-07-30 15:26:42 +01:00
Tom Christie
5b39d820be Remove 'load url from future' tags in templates. 2015-07-30 15:14:02 +01:00
Tom Christie
1f55bc747b Merge pull request #2926 from tomchristie/admin-style 
Admin style renderer
 2015-07-30 15:01:37 +01:00
Tom Christie
1f50f08f28 Merge pull request #3190 from Hachikooking/master 
Correct API ROOT to enable parametered urls
 2015-07-30 14:54:17 +01:00
Tom Christie
79b825ef32 Drop unused import 2015-07-30 14:38:04 +01:00
Tom Christie
a4e0f03050 Tweak quickstart to show newest users first in list view 2015-07-30 14:18:09 +01:00
Tom Christie
5c1d6a9200 Docs for AdminRenderer 2015-07-30 14:07:51 +01:00