Tom Christie
712ab8e3dc
Merge pull request #1262 from tomchristie/fix-1261
...
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
2013-12-08 23:52:55 -08:00
Tom Christie
5eca31d161
Merge pull request #1275 from qooleot/master
...
RelatedField is function of serializer class
2013-12-08 23:46:55 -08:00
Tom Christie
80ef2685e5
Merge master
2013-12-09 07:45:45 +00:00
Tom Christie
175b4d233d
Merge pull request #1276 from lalkaka/master
...
Minor grammar fix -- 'team' is singular
2013-12-08 23:38:32 -08:00
Tom Christie
4e9385e709
Drop unneeded assert
2013-12-09 07:37:13 +00:00
Tom Christie
06d8a31e13
Catch and mask ParseErrors that occur during rendering of the BrowsableAPI.
2013-12-09 07:34:08 +00:00
Rustam Lalkaka
b8732d2165
Minor grammar fix -- 'team' is singular
2013-12-08 19:34:24 -05:00
taras
3399158d62
RelatedField is function of serializer class
2013-12-08 11:40:40 -05:00
Tom Christie
14ae301254
Merge pull request #1274 from wilsaj/patch-1
...
docfix: update installation example to work with django 1.6
2013-12-07 05:20:41 -08:00
Andy Wilson
db19fba50d
update installation example to work with django 1.6
...
looks like django.conf.urls.defaults was deprecated as of django 1.6
2013-12-06 22:31:07 -06:00
Tom Christie
910de38a9c
Version 2.3.10
2013-12-06 22:13:50 +00:00
Tom Christie
85d9eb0f7e
Update release-notes.md
2013-12-06 21:47:26 +00:00
Tom Christie
51359e4612
Added @chuckharmston for kickass bug squashing in #1272
2013-12-06 21:42:52 +00:00
Tom Christie
e05fac685b
Merge pull request #1272 from chuckharmston/1158-partial_relatedfield_null
...
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158 )
2013-12-06 13:40:35 -08:00
Chuck Harmston
cf6c11bd4b
Raise appropriate error in serializer when making a partial update to set a required RelatedField to null (issue #1158 )
2013-12-06 14:00:23 -06:00
Tom Christie
e155534f4f
Merge pull request #1270 from irrelative/master
...
fix setup.py with new __init__.py boilerplate
2013-12-06 02:09:10 -08:00
Justin Davis
79596dc613
fix setup.py with new __init__.py boilerplate
2013-12-05 13:17:23 -08:00
Tom Christie
1f8069c0a9
Boilerplate cuteness
2013-12-05 11:05:25 +00:00
Tom Christie
f8088bedef
Upgrade JSONP security warning.
2013-12-05 09:01:00 +00:00
Tom Christie
b88e537802
Merge pull request #1269 from infecto/master
...
fix broken documentation links
2013-12-05 00:16:43 -08:00
Drew Kowalik
f2682537e0
fix broken documentation links
2013-12-04 16:10:05 -08:00
Tom Christie
6446b44f01
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-12-04 14:59:28 +00:00
Tom Christie
de5b9e39dd
First pass on contribution guide
2013-12-04 14:59:09 +00:00
Tom Christie
04a43ddca5
Merge pull request #1267 from tomchristie/fix-1133
...
Clarify wording, fixes #1133 .
2013-12-04 00:52:07 -08:00
Tom Christie
3c3906e278
Clarify wording, fixes #1133 .
2013-12-04 08:51:34 +00:00
Tom Christie
25ac4cd20e
Merge pull request #1265 from tomchristie/fix-1196
...
Remove Content-Type header from empty responses. Fixes #1196
2013-12-03 09:00:25 -08:00
Tom Christie
38d78b21c0
Remove Content-Type header from empty responses. Fixes #1196
2013-12-03 16:55:11 +00:00
Tom Christie
774298f145
First pass at a test for ParseErrors breaking the browsable API
2013-12-03 16:18:35 +00:00
Tom Christie
9f1918e41e
Added @ian-foote, for work on #1250 . Thanks!
2013-12-03 16:06:57 +00:00
Tom Christie
b92c911cf6
Update release-notes.md
2013-12-03 16:05:19 +00:00
Tom Christie
344cd865ab
Merge pull request #1250 from Ian-Foote/choice_field
...
Add choices to options metadata for ChoiceField.
2013-12-03 08:03:02 -08:00
Tom Christie
c1d9a96df0
Catch errors during parsing and set empty .DATA/.FILES before re-raising.
2013-12-03 08:58:05 +00:00
Tom Christie
fe4c7d4000
Update release-notes.md
2013-12-03 08:26:58 +00:00
Tom Christie
ac61697890
Merge pull request #1258 from pyriku/delete-signals-destroy-model-mixin
...
Adds pre_delete and post_delete hooks on `DestroyModelMixin`
2013-12-03 00:25:54 -08:00
Pablo Recio
699ec7236b
Adds pre_delete and post_delete hooks on
2013-12-03 00:07:41 +00:00
Tom Christie
01040b077c
Merge pull request #1256 from minddust/fix_docs_sample
...
Fix TemplateHTMLRenderer example
2013-12-02 02:46:16 -08:00
Stephan Groß
850cd83ba7
Fix TemplateHTMLRenderer example
2013-12-02 11:44:04 +01:00
Tom Christie
6ceb0fa94a
Merge pull request #1252 from thedrow/patch-3
...
Recommend using Pillow instead of PIL.
2013-11-27 04:55:59 -08:00
Omer Katz
c46106c961
Rephrased documentation changes according to feedback on IRC.
2013-11-27 14:47:37 +02:00
Omer Katz
b8f8fb7779
Updated the assertion message of the ImageField.
2013-11-27 13:26:49 +02:00
Omer Katz
2dce8d7a8a
Recommend using Pillow instead of PIL.
2013-11-27 13:23:49 +02:00
Ian Foote
8d09f56061
Add unittests for ChoiceField metadata.
...
Rename 'name' to 'display_name'.
2013-11-27 11:06:42 +00:00
Ian Foote
2484fc9141
Add more context to the ChoiceField metadata.
2013-11-26 17:10:16 +00:00
Ian Foote
a38d9d5b24
Add choices to options metadata for ChoiceField.
2013-11-26 09:33:47 +00:00
Malcolm Box
6af31ed394
Remove u from literals
2013-11-22 10:59:48 +00:00
Malcolm Box
263281d71d
Fix issue #1231 : JSONEncoder doesn't handle dict-like objects
...
Check for __getitem__ and then attempt to convert to a dict.
The check for __getitem__ is there as there's no universal way to
check if an object is a mapping type, but this is a likely proxy
2013-11-21 20:09:48 +00:00
Tom Christie
43c4e3aab8
Merge pull request #1229 from jgomezb/patch-2
...
Update urlpatterns.py
2013-11-21 01:43:07 -08:00
Tom Christie
3765865b4b
Update 'default' explanation. Closes #1239
2013-11-20 17:40:56 +00:00
Tom Christie
304b193efe
Update release-notes.md
2013-11-19 15:58:34 +00:00
Tom Christie
75744b2a89
Merge pull request #1240 from KrzysiekJ/put-as-create
...
Added handling of validation errors in PUT-as-create.
2013-11-19 07:57:00 -08:00
