Tom Christie
7e4f9f0863
Merge pull request #1182 from tamakisquare/add-to-credits
...
add @tamakisquare for work on #1111
2013-10-18 00:59:29 -07:00
Colin
daf927ef68
add @tamakisquare for work on #1111
2013-10-17 12:28:58 -07:00
Tom Christie
2394f05e5a
Merge pull request #1170 from craigds/write-into-foreignkey-with-source
...
fix writing into foreign key with non-null source
2013-10-17 07:59:29 -07:00
Tom Christie
6a40202a64
Merge pull request #1112 from tamakisquare/issue-1111
...
Test case and fix for issue 1111
2013-10-17 07:31:15 -07:00
Tom Christie
8c60471766
Merge pull request #1172 from brutasse/fix/return-object
...
Return object in save_object
2013-10-17 07:19:38 -07:00
Bruno Renié
cc3c16eaa0
Fix a docstring to reflect what the method does
2013-10-17 16:08:17 +02:00
Tom Christie
545ee013e3
Added @badale, for work on #1179 . Thanks!
2013-10-17 09:40:06 +01:00
Tom Christie
b3e0145294
Merge pull request #1181 from badale/master
...
Fixed #1179 : RepresenterError with DecimalField and YAMLRenderer
2013-10-17 01:38:27 -07:00
badaud_t
b730aec0f4
Fix decimal support with YAMLRenderer
2013-10-17 01:08:24 +02:00
badaud_t
8a5fea06f0
Fix typo YAMLRendererTests
2013-10-17 01:07:50 +02:00
Tom Christie
bdf8b53218
Merge pull request #1180 from kevin-brown/pull_1164
...
Put template block around the description
2013-10-16 06:41:58 -07:00
Omer Katz
d31fd33f4b
Allow to customize description so that markup can be accepted if needed.
2013-10-16 09:15:02 -04:00
Rikki
bf60848952
Using the filenames where relevant
...
Sometimes it's hard to tell which file the code is intended to go in. Now it spells it out.
2013-10-16 03:21:43 +01:00
Rikki
cb123e896e
Mention name of file to edit
...
To reduce unnecessary cognitive load of the learner, name the file they are putting this code in.
2013-10-16 03:08:43 +01:00
Rikki
e83bc00323
Added name of file to edit
...
So reader doesn't have to remember, or check through all the files to find where this code fragment was, mention the file name when it is relevant.
2013-10-16 03:03:51 +01:00
Colin Huang
c6be12f02b
[Fix]: Error with partial=True and validate_<name>
...
The error occurs when serializer is set with partial=True and a
field-level validation is defined on a field, for which there's no
corresponding update value in .data
2013-10-15 17:05:10 -07:00
Tom Christie
d68700740f
Merge pull request #1171 from alazaro/patch-1
...
Add missing commas in relations.md
2013-10-13 02:13:00 -07:00
Álvaro Lázaro
89ac03af26
Add missing commas in relations.md
2013-10-12 20:31:33 +02:00
Tom Christie
97fbc5caec
Merge pull request #1157 from dpetzel/tutorial_authentication
...
Be sure to import UserSerializer
2013-10-11 00:36:55 -07:00
Craig de Stigter
86ea969e11
fix ticket link in test docstring
2013-10-11 15:50:07 +13:00
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
864497eebb
Be sure to import UserSerializer
2013-10-05 23:16:58 -04: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
36046168b6
Merge pull request #1148 from thedrow/patch-1
...
Fixed code example.
2013-10-03 08:39:19 -07:00
Omer Katz
ab4be47379
Fixed code example.
2013-10-03 17:34:34 +02: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
1bd8fe4152
Whitespace fix
2013-09-25 10:36:08 +01:00
