encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-11 04:07:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,216 Commits 18 Branches 132 Tags 104 MiB
1fd83adb9c
Commit Graph

3216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
1fd83adb9c Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-09-26 16:09:31 +01:00
Tom Christie
75d6446c87 Allow .template_name attribute specified on view. Closes #1000 2013-09-26 16:09:08 +01:00
Tom Christie
57a51f790b Added @mkai, for work on #1126. Thanks! 2013-09-24 09:21:55 +01:00
Tom Christie
ff5f5f1117 Merge pull request #1126 from mkai/_django1.6_model_name 
Address pending deprecation of Model._meta.module_name in Django 1.6
 2013-09-24 01:20:30 -07:00
Markus Kaiserswerth
abbe9213f9 Address pending deprecation of Model._meta.module_name in Django 1.6 2013-09-23 17:48:25 +02:00
Tom Christie
0e58d4c74f Merge pull request #1125 from gkapkowski/patch-1 
Match docs to current code.
 2013-09-23 07:48:58 -07:00
Grzegorz Kapkowski
fda0c520bd Match docs to current code. 2013-09-23 16:10:46 +02:00
Tom Christie
97dd78d88c Merge pull request #1124 from johnmee/patch-1 
Mindnumbingly trivial single-char typo.
 2013-09-22 23:32:48 -07:00
John Mee
de6e7accef Mindnumbingly trivial single-char typo. 2013-09-23 14:03:09 +10:00
Tom Christie
d9a8bc0892 Merge pull request #1117 from carltongibson/#1116 
Clear cached serializer data on `save()` + test. Fixes #1116.
 2013-09-20 05:34:57 -07:00
Carlton Gibson
b82c44af48 Correct typo in doc string. 2013-09-20 14:20:21 +02:00
Carlton Gibson
f07a4f4ca3 Clear cached serializer data on save() + test. Fixes #1116. 2013-09-20 14:10:46 +02:00
Tom Christie
eb0a98ad4b Merge pull request #1115 from soncco/patch-1 
Fixing simple typo
 2013-09-17 23:49:03 -07:00
Braulio Soncco
3d8fad0444 Fixing simple typo 2013-09-18 00:33:05 -05:00
Tom Christie
e8c6cd5622 Update release notes. 2013-09-13 19:43:19 +01:00
Tom Christie
36bd4f22a7 Merge pull request #1107 from dpretty/master 
Let JSONEncoder handle Numpy data types.
 2013-09-13 11:42:15 -07:00
Tom Christie
d75ecb3d69 Added @mrmachine. Thanks! 
For work on #1109.
 2013-09-13 19:40:58 +01:00
Tom Christie
a96d0203fe Merge pull request #1109 from thirstydigital/tickets/1105-renderer-context 
Fixed #1105 -- Add hook for custom context in `BrowsableAPIRenderer`.
 2013-09-13 11:38:23 -07:00
Tai Lee
a9dbd46c94 Refs #1109 -- Update docs. Integrate changes from feedback. 2013-09-14 00:54:44 +10:00
Tai Lee
bb3261ca48 Fixed #1105 -- Add hook for custom context in BrowsableAPIRenderer. 
Replace hard coded response status check with `allow_form` context
variable, so that it can be overridden in a custom renderer class.
 2013-09-13 23:11:44 +10:00
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
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
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
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