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
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
George Hickman
4807e00bff
Set up wheel distribution support
2013-11-15 15:49:53 +00:00
Tom Christie
128bda5712
Use less specfic language in UltaJSON notes
2013-11-15 15:24:32 +00:00
Tom Christie
7a0e2ed6f6
Version 2.3.9
2013-11-15 13:55:36 +00:00
Tom Christie
1d1b2f765c
Version 2.3.9
2013-11-15 13:55:02 +00:00
jgomezb
6be62bc1d7
Update urlpatterns.py
...
Allow numbers in format extension.
2013-11-14 09:22:07 +01:00
Tom Christie
134ffd96a1
Merge pull request #1226 from alexjg/master
...
Add Alex Good to credits (Whoop!)
2013-11-13 06:40:05 -08:00
Alex
72d72e4d3e
Add Alex Good to credits (Whoop!)
2013-11-13 14:32:37 +00:00
Tom Christie
fc1047e9b4
Merge pull request #1224 from alexjg/allow-aggregate-ordering
...
Allow aggregate ordering
2013-11-13 04:04:50 -08:00
Alex
e29942948f
Undo version bump
2013-11-13 12:06:59 +00:00
Alex
f4e610248b
Bump version
2013-11-12 23:46:01 +00:00
Alex
5136798a04
Merge branch 'master' into allow-aggregate-ordering
2013-11-12 23:40:24 +00:00
Alex
d1dc68d755
Add queryset aggregates to allowed fields in OrderingFilter
2013-11-12 23:40:07 +00:00
Tom Christie
8552e79d7b
Merge pull request #1220 from hzy/patch-1
...
Added drf-ujson-renderer to renderers docs
2013-11-11 03:29:00 -08:00
Jacob Haslehurst
52ac2199a8
Added drf-ujson-renderer to renderers docs
...
drf-ujson-renderer is a third party renderer that implements JSON renderering using UltraJSON
2013-11-11 22:24:37 +11:00
Tom Christie
b65b43c732
Merge pull request #1219 from sepeth/fix-documentation-typo
...
Typo on api-guide/fields.md and serializers.py
2013-11-11 01:58:43 -08:00
Doğan Çeçen
fd2c291c4d
Typo on api-guide/fields.md and serializers.py
2013-11-11 11:54:30 +02:00
Tom Christie
470134ae9b
Merge pull request #1217 from benpbenp/master
...
Fix object creation with reverse M2M when related_name unspecified
2013-11-08 07:15:40 -08:00
Tom Christie
209f238f42
Merge pull request #1215 from brutasse/versions
...
Updated versions in tox and travis config
2013-11-08 07:14:05 -08:00
Bruno Renié
f2ea5780d2
Exclude 1.4 on python 3
2013-11-08 14:58:36 +01:00
Bruno Renié
88b37d0f22
Merge remote-tracking branch 'upstream/master' into versions
2013-11-08 14:51:09 +01:00
Tom Christie
541871feca
Merge pull request #1216 from linovia/master
...
Fixed a regression with ValidationError under Django 1.6
2013-11-08 05:22:33 -08:00
Ben Pietravalle
b7b57adee2
Fix object creation with reverse M2M when related_name unspecified
...
It seems that field.related_query_name() does not return the related_name
for reverse M2M relations when related_name is not explicitly set in the M2M field
definition.
So, change to use obj.get_accessor_name(), where obj is an instance of
RelatedObject, as are returned by a model's
_meta.get_all_related_many_to_many_objects(), or as in the tuples returned by
_meta.get_all_m2m_objects_with_model().
2013-11-08 13:19:40 +00:00
