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
Krzysztof Jurewicz
9cea6880f7
Added handling of validation errors in PUT-as-create.
...
Fixes #1035 .
2013-11-19 15:49:31 +01:00
Tom Christie
ca2bd616d9
Remove a couple of .html suffixes in docs
2013-11-19 11:01:27 +00:00
Tom Christie
0beaa9bed2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-11-19 10:27:16 +00:00
Tom Christie
6330212453
Canonical page for index should be '/', not '/index'
2013-11-19 10:27:04 +00:00
Tom Christie
153eb80031
Merge pull request #1238 from linovia/bugfix/recovering_tests
...
Removed the DynamicSerializerView duplication
2013-11-19 01:24:50 -08:00
Xavier Ordoquy
88f5921f2f
Removed the DynamicSerializerView duplication
2013-11-18 20:15:35 +01:00
Tom Christie
bc69a6d983
Add a 404 page to the docs
2013-11-18 16:10:26 +00:00
Tom Christie
20325cce18
Drop .html suffixes in docs
2013-11-18 16:10:14 +00:00
Xavier Ordoquy
a8b15f4290
Another fix for nested writable serializers in case of the related_name isn’t set on the ForeignKey.
2013-11-18 15:11:29 +01:00
Tom Christie
4ddbeb1634
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-11-18 09:29:22 +00:00
Tom Christie
075b8c1037
Add User import. Refs #599
2013-11-18 09:29:09 +00:00
Tom Christie
6eeebea12b
Merge pull request #1235 from thedrow/patch-3
...
Enabled syntax highlighting in the README file.
2013-11-18 01:26:46 -08:00
Omer Katz
f322e894ae
Enabled syntax highlighting in the README file.
2013-11-18 09:21:09 +02:00
Tom Christie
fb3fcf0710
Merge pull request #1233 from ghickman/wheel
...
Set up wheel distribution support
2013-11-17 10:30:50 -08:00
Xavier Ordoquy
ad7aa8fe48
Fixed the nested model serializers in case of the related_name isn’t set.
2013-11-17 01:27:16 +01:00