encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-27 20:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity
731 Commits 18 Branches 132 Tags 105 MiB
9d5f37d9b6
Commit Graph

731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
9d5f37d9b6 Drop 2.5 testing from travis - not compatible with Django 1.5 2012-08-25 20:13:43 +01:00
Tom Christie
46ecf8d86f Travis CI 2012-08-25 20:07:53 +01:00
Tom Christie
00d3aa21ba Updated sandbox links 2012-08-25 19:53:10 +01:00
Tom Christie
7d70948f9b Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2012-08-25 19:19:07 +01:00
Marko Tibold
239d8c6c4d Point Live examples to heroku. 2012-08-25 04:02:12 +03:00
Tom Christie
7557777c66 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2012-08-24 16:06:23 +01:00
Tom Christie
db7d15d5d1 Merge pull request #181 from flashingpumpkin/master 
Maintain a reference to the parent/root serializer
 2012-08-23 04:15:41 -07:00
Tom Christie
acbc2d1768 Added @pilt - Thanks! 2012-08-21 17:39:40 +02:00
Tom Christie
ee77e871b2 Merge pull request #236 from Memoto/master 
Allow views to specify what template to use
 2012-08-21 08:38:49 -07:00
Tom Christie
e9f67d3afc Update AUTHORS 
Added @max-arnold, @ralphje.
Thanks folks!
 2012-08-21 10:40:43 +02:00
Tom Christie
8898111611 Merge pull request #224 from ralphje/master 
Modify 415 error content
 2012-08-21 01:38:21 -07:00
Tom Christie
21b5601d3b Merge pull request #229 from max-arnold/228-runtime-head 
add View.head() method at runtime (issue #228)
 2012-08-21 01:37:20 -07:00
Alen Mujezinovic
2f9775c12d Don't ever return the normal serializer again. 2012-08-13 15:58:23 +01:00
Simon Pantzare
abd3c7b46d Allow template to be set on views 2012-08-10 19:32:55 +02:00
Tom Christie
cb7a815560 Added @yetist 2012-07-28 21:50:58 +02:00
Tom Christie
6dff0480f9 Merge pull request #234 from yetist/master 
support utf8 description
 2012-07-28 12:49:55 -07:00
yetist
2deb31d096 support utf8 description 2012-07-27 11:39:24 +08:00
Max Arnold
650c04662d remove remaining head() method 2012-07-12 23:13:04 +07:00
Max Arnold
fe262ef353 patch View.head() only for django < 1.4 2012-07-12 23:12:09 +07:00
Max Arnold
36686cad13 add View.head() method at runtime (should fix AttributeError: object has no attribute 'get') 2012-07-12 22:40:24 +07:00
Tom Christie
b1fca03089 Merge pull request #227 from mammique/filter 
add_query_param should preserve previous querystring
 2012-07-12 08:16:19 -07:00
Camille Harang
b0004c4398 add_query_param should preserve previous querystring 2012-07-12 15:07:04 +02:00
Ralph Broenink
0e3a2e6fdd Modify mixins.py to make sure that the 415 (Unsupported Media Type) returns its error in the 'detail' key instead of in the 'error' key (for consistency with all other errors). 2012-07-06 15:43:02 +03:00
Tom Christie
1f9a8e10e5 Added Adam Ness. Thanks! 2012-07-03 12:44:13 +02:00
Tom Christie
17532310a2 Merge pull request #223 from greylurk/ie-headers 
Implements Accept headers from IE in the case describe in Issue 215
 2012-07-03 03:42:06 -07:00
Adam Ness
73be041c47 Patch to enable Accept headers in Internet Explorer when an Ajax Library on the client (i.e. jQuery) is sending an XMLHttpRequest 2012-07-02 20:39:56 -07:00
Tom Christie
11147ce13e Don't bork if request attribute is not set. 2012-06-28 14:16:30 +02:00
Tom Christie
c124585df6 Merge pull request #219 from scfarley/related-serializers-2 
Pass request to related serializers
 2012-06-28 05:06:48 -07:00
Sean C. Farley
1b49c5e3e5 Pass request to related serializers 
Related serializers may need access to the request to properly serialize
a child resource.  For example, reverse() in djangorestframework.reverse
uses request if available to return an absolute URL.  While the parent
resource has access to the request to generate the absolute URL, the
child resource does not.
 2012-06-26 19:27:57 -04:00
Tom Christie
9dbaac3182 Merge pull request #210 from max-arnold/serialize-raw-queryset 
Small patch to allow RawQuerySet serialization
 2012-05-22 01:19:55 -07:00
Max Arnold
b689db17b3 Allow RawQuerySet serialization 2012-05-22 12:39:50 +07:00
Tom Christie
0c82e4b575 1.4 Ain't alpha. 2012-05-11 09:46:00 +02:00
Marko Tibold
d88ae359b8 Fix typo. 2012-04-12 01:06:35 +03:00
Marko Tibold
64a49905a4 Use seuptools to be explicit about optional version-dependency of markdown. 2012-04-11 23:51:00 +02:00
Marko Tibold
a07212389d Fixes #94. Thanks @natim. Only Markdown 2.0+ is supported currently. 2012-04-11 23:13:04 +02:00
Marko Tibold
e53c819cc7 Fix broken pygments test. 2012-03-27 23:40:33 +02:00
Alen Mujezinovic
e3d7c36105 Don't return unknown field errors if allow_unknown_form_fields is True 2012-03-20 13:21:24 +00:00
Alen Mujezinovic
537fa19bac Whoops. Adding the .parent attribute to the Serializer class broke 
getattr(self,'parent',self). This fixes it.
 2012-03-01 13:17:29 +00:00
Alen Mujezinovic
0a57cf9876 Added a .parent attribute to the Serializer object for documentation 
purposes
 2012-03-01 12:51:23 +00:00
Alen Mujezinovic
54a19105f0 Maintain a reference to the parent serializer when descending down into fields 2012-03-01 12:46:38 +00:00
Marko Tibold
55317b0372 Fixes broken permissions-example. 
reverse takes `request` as a kwarg.
 2012-02-29 21:32:10 +01:00
Tom Christie
1751655927 Update docs/requirements.txt 2012-02-27 10:06:20 +00:00
Tom Christie
2fe6913b1a Added @shawnlewis. Thanks! 2012-02-24 13:13:11 +00:00
Tom Christie
f041ee023e Merge pull request #179 from shawnlewis/master 
Okay, that looks good to me!
 2012-02-24 05:12:23 -08:00
Shawn Lewis
9c92f96ce2 Fix for #178. 
Related serializers passed in via include now work as expected.
 2012-02-23 16:30:44 -08:00
Shawn Lewis
98c16e6da8 Test for issue #178. 
This failing test shows that the serializer implementation breaks when a
related serializer is passed in via include rather than via fields.
 2012-02-23 16:28:01 -08:00
Tom Christie
2d2e2f95b0 Cleanup of reverse docs 2012-02-23 16:02:16 +00:00
Tom Christie
7183815235 Version 0.4.0-dev 2012-02-23 09:29:51 +00:00
Tom Christie
afdda88b13 Remove unused 'staticviews' 2012-02-23 09:22:37 +00:00
Tom Christie
e15494a172 Remove InstanceMixin auto-url magicks. 2012-02-23 09:21:01 +00:00