encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 12:04:02 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,249 Commits 18 Branches 132 Tags 105 MiB
7c3769f04b
Commit Graph

3249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig de Stigter
7c3769f04b fix writing into foreign key with non-null source 2013-10-11 15:31:55 +13:00
Tom Christie
f18158358d Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-10-10 17:34:15 +01:00
Tom Christie
c3e370b168 Merge branch 'html-form-rendering' 2013-10-10 17:33:39 +01:00
Tom Christie
9e29c63895 Ensure read-only fields don't break with current HTML renderer behavior 2013-10-10 17:33:22 +01:00
Carlton Gibson
0bbc775b95 Merge pull request #1071 from craigds/field-transform-methods 
Feature: add transform_<fieldname> methods to serializers
 2013-10-09 01:11:46 -07:00
Tom Christie
761e66ffdd Merge pull request #1156 from dpetzel/tutorial_serialization 
typo fix
 2013-10-06 00:40:25 -07:00
dpetzel
48a38386af **very minor** typo fix 2013-10-05 19:29:25 -04:00
Tom Christie
3833f1d55f Added @hcliff for #1153. Thanks! 2013-10-04 15:55:57 +01:00
Tom Christie
0d98622c21 Merge pull request #1153 from hcliff/master 
support args on get_object_or_404
 2013-10-04 07:54:32 -07:00
Henry Clifford
3e94f4dc70 support args on get_object_or_404 2013-10-04 10:49:56 -04:00
Tom Christie
afc9e9e038 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-10-03 15:18:47 +01:00
Tom Christie
f6301636fb Drop erronous left-over bit of docs. Closes #1147 2013-10-03 15:18:38 +01:00
Tom Christie
38049d11b6 Merge pull request #1104 from FreakyDug/master 
Fix a TypeError when a serializer is created with files but no data
 2013-10-03 05:07:07 -07:00
Philip Douglas
a2ae469f6b Merge remote-tracking branch 'upstream/master' 2013-10-03 11:12:55 +01:00
Craig de Stigter
42bbf6907e docs: add paragraph on transform_fieldname methods 2013-10-03 12:38:42 +13:00
Craig de Stigter
dc650f77b5 add tests for transform_fieldname methods 2013-10-03 11:34:42 +13:00
Tom Christie
8d4ba478cc Fix rendering of forms and add error rendering on HTML form 2013-10-02 16:13:34 +01:00
Tom Christie
a14f1e8864 Serializers can now be rendered directly to HTML 2013-10-02 13:45:35 +01:00
Tom Christie
c3175900bc Merge pull request #1144 from jeffnuss/patch-1 
Update release-notes.md
 2013-10-02 01:13:39 -07:00
Jeff
61dd9ce914 Update release-notes.md 
Simple typo fix.
 2013-10-01 15:47:47 -06:00
Tom Christie
452eb81f5c Merge pull request #1140 from doronpr/patch-1 
corrected doc for throttle_classes decorator
 2013-09-30 11:17:57 -07:00
Doron Pearl
8a1d327579 corrected doc for throttle_classes decorator 
the decorator actually expects an array and otherwise raise an exception.
 2013-09-30 14:08:46 -04:00
Tom Christie
5a9d5b3033 Merge pull request #1136 from KrzysiekJ/patch-1 
Minor documentation fix.
 2013-09-29 09:40:50 -07:00
Krzysztof Jurewicz
49847584a8 Minor documentation fix. 2013-09-29 12:49:38 +02:00
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
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