encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-24 02:24:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,586 Commits 18 Branches 132 Tags 105 MiB
050e228edc
Commit Graph

1586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
b19c58ae17 Support for HTML error templates. Fixes #319. 2012-11-06 10:44:19 +00:00
Ben Konrath
09f39bd23b Merge branch 'master' into restframework2-filter 2012-11-06 03:22:25 +01:00
Toni
5d69628250 Update rest_framework/serializers.py 
fixed AttributeError in case restore_object is overwritten without explicitly setting self.m2m_data
 2012-11-05 20:55:03 +01:00
Tom Christie
455a8cedcf Tweaks 2012-11-05 17:03:22 +00:00
Tom Christie
9746abdf72 Version 2.1.0. Adding release notes. 2012-11-05 16:46:33 +00:00
Tom Christie
1418d104a8 Tweak related field docs now that queryset is no longer required. 2012-11-05 16:44:26 +00:00
Tom Christie
867033e676 slug_url_kwarg should default to same as slug_field 2012-11-05 16:43:44 +00:00
Tom Christie
9731b95fc3 Merge pull request #347 from minddust/master 
support for passing custom slug options to HyperlinkedRelatedField
 2012-11-05 08:36:59 -08:00
Tom Christie
b87f01aa54 Merge pull request #371 from tomchristie/serializer-fixes 
Serializer fixes
 2012-11-05 08:35:54 -08:00
Tom Christie
6d201c362f Drop unneccesarily lenient dictionary-containing-instances serialization. 2012-11-05 16:19:11 +00:00
Stephan Groß
85b176cf47 added docs 2012-11-05 16:51:49 +01:00
Stephan Groß
0a660a531a fixed typo 2012-11-05 16:43:03 +01:00
Tom Christie
33217db33e Fix broken link 2012-11-05 15:39:03 +00:00
Tom Christie
558b29e5ff Added @mjs7231 - Thanks! 2012-11-05 15:38:22 +00:00
Stephan Groß
03095f607a added testcase for custom slug field in hyperlinkedrelatedfield 2012-11-05 16:37:37 +01:00
Tom Christie
33be4b43b9 queryset argument is now optional on writable model fields. 2012-11-05 12:51:04 +00:00
Tom Christie
ccd5f29510 Tidy up serializer fields now we no longer use dynamic fields 2012-11-05 11:03:36 +00:00
Tom Christie
dfb8225447 Add note on * import 2012-11-05 10:56:30 +00:00
Tom Christie
b7b942c599 Swap position of instance and data keyword arguments. 2012-11-05 10:53:20 +00:00
Stephan Groß
44449fa1f5 Merge remote-tracking branch 'upstream/master' 2012-11-05 11:45:49 +01:00
Tom Christie
5b397e50dd Include queryset missing exception on writable SlugField 2012-11-05 10:16:23 +00:00
Tom Christie
362c413f08 Update release notes. 2012-11-05 09:59:35 +00:00
Tom Christie
a4ab4355a6 Added @osiloke. Thanks! 2012-11-05 09:59:35 +00:00
Tom Christie
8c8bf61c13 Merge pull request #365 from osiloke/e74772b8a6d0d9d218946a6bc8411afe8e77e0bb 
Rare case where rel attribute of model field is None and DRF tries to return rel.to
 2012-11-05 01:57:29 -08:00
Tom Christie
b8fa379e50 Merge pull request #364 from mjs7231/master 
Fix for bug #363: ChoiceField missing in renderers.py
 2012-11-05 01:54:07 -08:00
Tom Christie
584c111aab Merge pull request #366 from jmagnusson/master 
Support for Djangos caching framework, fixes #346
 2012-11-05 01:48:19 -08:00
Osiloke Emoekpere
e74772b8a6 This accounts for none(null) values of rel.to when converting model fields from native 2012-11-04 13:20:10 -05:00
Michael Shepanski
3d0f8b792f Fix for bug #363: ChoiceField missing in renderers.py 2012-11-04 12:31:37 -05:00
Jacob Magnusson
7df7dadccd Remove `request' from response instance while 
testing caching
 2012-11-04 13:42:29 +01:00
Jacob Magnusson
bd5a3ee7d5 Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2012-11-04 12:52:11 +01:00
Jacob Magnusson
963c5fe4a7 Remove attributes that are not needed when caching 
the Response object. This fixes #346
 2012-11-04 12:48:41 +01:00
Jacob Magnusson
44f280c3ab Add tests for caching of GET/HEAD requests using 
Django's built in caching framework.
Currently fails as some attributes on the Response
object are not pickable
 2012-11-04 12:47:46 +01:00
Tom Christie
3e0319389a Added @jmagnusson. Thanks! 2012-11-04 09:45:30 +00:00
Tom Christie
746686b065 Merge pull request #360 from jmagnusson/master 
Tests for pull #358 "Return dictionaries as is"
 2012-11-03 00:31:36 -07:00
Jacob Magnusson
38af6107b5 Added test for ModelSerializer Meta fields 
returning as expected
 2012-11-03 00:32:08 +01:00
Jacob Magnusson
1b49615c00 Added test that makes sure that fields with 
dictionaries as data are returned as expected and
not turned into string representations
 2012-11-03 00:32:02 +01:00
Jacob Magnusson
19a218f859 Bye bye star import 2012-11-03 00:27:56 +01:00
Tom Christie
59c1e0933f Update release notes 2012-11-02 21:13:29 +00:00
Tom Christie
b468dd6271 Merge pull request #359 from tomchristie/relationship_tests 
Relationship tests
 2012-11-02 14:08:49 -07:00
Tom Christie
dafbbdc5bf Merge pull request #358 from jmagnusson/master 
Return dictionaries as is
 2012-11-02 14:08:21 -07:00
Tom Christie
8ec54e6a9f Tweaks 2012-11-02 20:56:51 +00:00
Tom Christie
6eaec7a0ec foreign key tests 2012-11-02 20:53:33 +00:00
Jacob Magnusson
a6806f0307 Apply to_native on dictionary keys as well 2012-11-02 21:48:16 +01:00
Jacob Magnusson
3de61d200c Don't convert dictionary into a string representation 2012-11-02 20:55:58 +01:00
Tom Christie
e84ce60a0d Initial PK relationship tests 2012-11-02 19:11:40 +00:00
Tom Christie
b9bff2a984 Fix issues with pk related fields in the browsable API. 2012-11-02 14:05:14 +00:00
Tom Christie
2dec2b9c13 Remove accidental egg-info files 2012-11-01 23:50:00 +00:00
Tom Christie
b8648c08be gitignore *.egg-info 2012-11-01 23:48:25 +00:00
Tom Christie
062f5caef3 Tweaks fields docs, and fix 2.0.1 version. 2012-11-01 23:40:34 +00:00
Tom Christie
09d70958bd Update release notes 2012-11-01 23:15:42 +00:00