encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-23 18:13:57 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,555 Commits 18 Branches 132 Tags 105 MiB
0383f11ff7
Commit Graph

3555 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
068e4a18f4 Merge pull request #1108 from rbose85/master 
Typo in strings referring to Python package, django-filter.
 2013-09-13 05:30:10 -07:00
Rajiv Bose
0de1a1a0ad Typo in strings referring to Python package, django-filter. 
On skip of django_filters related unit-tests the reason given states the Python package 'django-filters' is not install.

However, the Python package required to run django_filters related tests is 'django-filter'.
 2013-09-13 11:55:16 +01:00
Philip Douglas
e5da0ff5e5 Merge remote-tracking branch 'upstream/master' 2013-09-13 10:47:06 +01:00
Philip Douglas
272a6abf91 Try a more localised fix to the data=None problem 2013-09-13 10:46:24 +01:00
David Pretty
d489c5c881 Let JSONEncoder handle Numpy data types. 
json.JSONEncoder cannot serialize Numpy data types. Numpy arrays
and array scalars have a tolist() method which casts the object to
a standard python data type.
 2013-09-13 13:36:18 +10:00
Tom Christie
ea462b7b9b Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-09-12 21:41:31 +01:00
Tom Christie
895beb89c6 Note on '.model' as default only, with 'serializer_class', and 'queryset' attributes prefered. Closes #1100 2013-09-12 21:41:21 +01:00
Tom Christie
cd3040737e Merge pull request #1097 from mociepka/add_default_order_by_in_filtering 
Add order_by to the AutoFilterSet
 2013-09-12 13:24:26 -07:00
Tom Christie
2da9ab8cc5 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-09-12 20:27:36 +01:00
Tom Christie
dfc430caba Fix django guardian link 2013-09-12 20:27:23 +01:00
Philip Douglas
6e4bdb5596 Add missing newline at the end of test file 2013-09-12 16:04:33 +01:00
Philip Douglas
59cce01b33 Fix error when serializer gets files but no data 2013-09-12 16:03:20 +01:00
Tom Christie
2139dafef6 Merge pull request #1099 from diegoponciano/patch-1 
small typo correction on ViewSet example code
 2013-09-12 01:05:15 -07:00
Diego Ponciano
2a6a2013df small typo correction on ViewSet example code 2013-09-11 17:25:57 -03:00
Tom Christie
195790e60b Version 2.3.8 2013-09-11 09:09:30 +01:00
Tom Christie
e021472a16 Added @bwreilly for awesome work on #1093. Thanks!!! 2013-09-10 21:07:20 +01:00
Tom Christie
a1d7ed20d2 Add Django Guardian to travis testing 2013-09-10 21:06:53 +01:00
Tom Christie
101da45810 Updated release notes 2013-09-10 21:06:42 +01:00
Tom Christie
5970baa201 Tweaks and docs to object-level model permissions. 2013-09-10 21:00:13 +01:00
Tom Christie
75fb4b02b4 Merge branch 'master' of git://github.com/bwreilly/django-rest-framework into bwreilly-master 2013-09-10 20:21:15 +01:00
Philip Douglas
39e13a0d13 Merge remote-tracking branch 'upstream/master' 2013-09-10 13:09:25 +01:00
Michał Ociepka
222c1d1122 Add order_by to the AutoFilterSet 
`AutoFilterSet` should contains `order_by` set to all by default.
 2013-09-10 12:02:14 +02:00
Tom Christie
f5c34926d6 Update release-notes.md 2013-09-09 20:41:54 +01:00
bwreilly
23fc9dd53f better doc for object permissions, drop redundant has_permission call 2013-09-09 09:32:29 -07:00
bwreilly
0183c69538 removed unnecessary guardian req and view.action parsing 2013-09-09 08:39:09 -07:00
bwreilly
9ff0f6d3bf switch to a dedicated filter for read list object permissions 2013-09-07 23:48:03 -05:00
bwreilly
118645e480 first pass at object level permissions and tests 2013-09-07 23:18:52 -05:00
bwreilly
57d6b5fb7c necessary test settings for guardian 2013-09-07 23:16:43 -05:00
Tom Christie
b6c0c815aa Extra docs on custom exception handling. 2013-09-07 20:45:43 +01:00
Tom Christie
6908c183a4 Merge pull request #1092 from rouge8/custom-exception-handler-setting 
Support customizable view EXCEPTION_HANDLER (#907)
 2013-09-07 12:12:23 -07:00
Andy Freeland
bae0ef6b5d Add EXCEPTION_HANDLER docs to exception docs 2013-09-06 13:57:32 -05:00
Andy Freeland
b5523bcc7d Support customizable view EXCEPTION_HANDLER 
Add `api_settings.EXCEPTION_HANDLER` to support custom error responses.

Fixes #907.
 2013-09-06 12:47:33 -05:00
bwreilly
b07de86ad3 some properly failing tests, set up for standard permissions 2013-09-06 12:35:06 -05:00
bwreilly
4a9dcfa760 added guardian as optional requirement, stubbed out object-level permission class 2013-09-06 11:01:31 -05:00
Tom Christie
916d8ab37d Fix typo 2013-09-06 12:19:51 +01:00
Tom Christie
b47f1b0257 Added @edmundwong for work on #1076. Thanks! 2013-09-05 20:25:45 +01:00
Tom Christie
196a895fe4 Merge pull request #1076 from edmondwong/master 
Allow OPTIONS to retrieve PUT field metadata on empty objects
 2013-09-05 12:24:17 -07:00
Tom Christie
551fe92078 Merge pull request #1084 from thetylerhayes/master 
Tiny typo fix
 2013-09-04 03:42:25 -07:00
Tyler Hayes
c4cb26f73b Tiny typo fix 2013-09-04 03:38:34 -07:00
Edmond Wong
6e7e4fc01c Added test for OPTIONS before object creation from a PUT 2013-09-03 12:30:18 -07:00
Tom Christie
db3802c638 Merge pull request #1081 from kevin-brown/doac_docs_link 
Updated DOAC integration link
 2013-09-02 08:13:29 -07:00
Kevin Brown
d0123a1385 Changed DOAC documentation link 2013-09-02 10:23:54 -04:00
Tom Christie
8b245fed14 Add windows virtualenv activate instruction 
Closes #1075.
 2013-09-02 09:17:51 +01:00
Tom Christie
d4f5fe99ba Merge pull request #1078 from yprez/fix_1072 
Fix empty serializer bug
 2013-09-02 01:13:51 -07:00
Tom Christie
ec689c1ed2 Merge pull request #1077 from tom-leys/patch-2 
Updated tutorial part 6: 2 examples were missing includes
 2013-08-31 09:03:11 -07:00
Yuri Prezument
745ebeca77 Handle case where obj=None in PKRelatedField.field_to_native() 
Fixes #1072
 2013-08-31 17:20:49 +03:00
Yuri Prezument
a15cda4be4 Regression test for #1072 2013-08-31 17:10:15 +03:00
tom-leys
85ab879a85 Updated tutorial part 6: 2 examples were missing includes 2013-08-31 19:40:53 +12:00
Edmond Wong
3063a50fc2 Allow OPTIONS to retrieve PUT field metadata on empty objects 
This allows OPTIONS to return the PUT endpoint's object serializer metadata when the object hasn't been created yet.
 2013-08-30 18:03:44 -07:00
Tom Christie
f8101114d1 Update release notes 2013-08-30 09:31:35 +01:00