encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-12-03 23:14:07 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,125 Commits 18 Branches 132 Tags 105 MiB
ba735e6d27
Commit Graph

1125 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marko Tibold
ba735e6d27 Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into choices_for_ModelSerializer.get_field 2012-10-22 21:40:52 +02:00
Marko Tibold
91ea57bf98 ModelSerializer.get_field() now returns a ChoiceField if the model has choices. 2012-10-22 21:38:18 +02:00
Marko Tibold
aba0172f5c Update docs/api-guide/fields.md 
Fix typo.
 2012-10-22 21:31:15 +03:00
Marko Tibold
d1e05ea8d4 Merge commit '95a670de41a246777bc1e448dca8cc576b7b86ea' into BrowsableAPIRenderer 
Conflicts:
	rest_framework/renderers.py - manually resolved conflict
 2012-10-22 20:09:36 +02:00
Tom Christie
95a670de41 Merge field changes: .default and .widget 2012-10-22 15:24:09 +01:00
Tom Christie
bf06f0346a Merge pull request #311 from j4mie/fix-reverse-relations 
Fix serialization of reverse relationships
 2012-10-22 07:17:54 -07:00
Jamie Matthews
45d4622f09 Fix serialization of reverse relationships 2012-10-22 15:12:25 +01:00
Marko Tibold
ab1a12bfec Refactoring BrowsableAPIRenderer 2012-10-21 23:04:12 +02:00
Marko Tibold
c30712a5c8 Remove redundant check if method=='DELETE' 2012-10-21 22:23:54 +02:00
Tom Christie
93f1aa4f69 Remove initial kwarg, add default. 2012-10-21 17:41:05 +01:00
Tom Christie
13d0a82939 Minor docs tweaks 2012-10-21 17:40:49 +01:00
Daniel Sokolowski
d53ee8a10c Merge pull request #308 from markotibold/docs-edits 
Documentation spelling and other mistake fixes.
 2012-10-21 07:52:10 -07:00
Marko Tibold
65d4970bf7 Changed IsAdmin -> IsAdminUser in example 2012-10-21 16:34:50 +02:00
Marko Tibold
71a93930fd Fixing spelling errors. 2012-10-21 16:34:07 +02:00
Tom Christie
efabd2bb1b docs, docs, docs, docs, docs, docs, docs 2012-10-19 19:59:55 +01:00
Tom Christie
a7390fe704 Fix up widget choices 2012-10-19 09:47:01 +01:00
Tom Christie
dab177e29e Drop help_text 2012-10-19 09:20:54 +01:00
Daniel Sokolowski
46dffbd5b9 Merge pull request #307 from Roarster/dotted_branch_tests 
Added tests for dotted notation in serializer field source
 2012-10-18 18:22:37 -07:00
Tom Christie
643d3491a6 First pass at pastebin tutorial 2012-10-18 23:48:52 +01:00
Ian Strachan
d70e387f10 Added tests for dotted notation in serializer field source 2012-10-18 23:45:16 +01:00
Tom Christie
c341799344 Apply readonly on RelatedField 2012-10-18 22:19:54 +01:00
Tom Christie
d1746e2f3c Allow callables in dotted notation like Field(source='foo.bar') 2012-10-18 22:03:48 +01:00
Tom Christie
0c65d9babe Merge pull request #304 from tomchristie/consitent_settings 
Make settings consistent with corrosponding view attributes
 2012-10-18 04:46:01 -07:00
Tom Christie
e8f542aac8 Minor docs fix 2012-10-18 09:19:38 +01:00
Tom Christie
fed235dd01 Make settings consistent with corrosponding view attributes 2012-10-17 23:09:11 +01:00
Tom Christie
e126b61542 Negotiation API finalized. .select_renderers and .select_parsers 2012-10-17 22:58:18 +01:00
Tom Christie
bbd3728da6 Merge pull request #303 from tomchristie/parser_refactor 
Parser refactor
 2012-10-17 14:42:16 -07:00
Tom Christie
fb56f215ae Added media_type to .parse() - Consistency with renderer API. 2012-10-17 22:39:07 +01:00
Tom Christie
4231995fbd parser_context includes view, request, args, kwargs. (Not meta and upload_handlers) 
Consistency with renderer API.
 2012-10-17 22:19:59 +01:00
Tom Christie
99d48f9003 Drop .parse_string_or_stream() - keep API minimal. 2012-10-17 22:07:56 +01:00
Tom Christie
6717d654d0 Added @rdobson. Thanks! 2012-10-17 21:57:34 +01:00
Tom Christie
baf0e366ba Merge pull request #302 from rdobson/restframework2 
Make default field check safe for boolean values
 2012-10-17 13:55:30 -07:00
Rob Dobson
38673c35d4 Make default field check safe for boolean values whereby 'False' may be an acceptable default value 2012-10-17 19:12:34 +01:00
Tom Christie
cab4a2a5ad Split up doc sections more cleanly 2012-10-17 15:41:57 +01:00
Tom Christie
b5daa40852 Docs tweaks 2012-10-17 13:51:22 +01:00
Tom Christie
75ebf895ac Added @eofs. Thanks! 2012-10-17 13:51:22 +01:00
Tom Christie
78e85e02e4 Merge pull request #298 from eofs/restframework2 
Typo in class name fixed
 2012-10-17 01:08:00 -07:00
eofs
520a183cc6 Typo in class name 2012-10-17 10:41:23 +03:00
Tom Christie
ae680b13da Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-10-16 09:20:20 +01:00
Tom Christie
4fe734a91a Merge pull request #296 from ulmus/restframework2 
Removed serializers.TextField and related tests
 2012-10-15 06:04:55 -07:00
Tom Christie
3c8f01b985 Explicit CSRF failure message. Fixes #60. 2012-10-15 14:03:36 +01:00
Tom Christie
9c1fba3483 Tweak parsers to take parser_context 2012-10-15 13:27:50 +01:00
Jens Alm
9f3ff0105a Removed serializer.TextField and related tests 2012-10-15 14:09:29 +02:00
Tom Christie
e88ca9637b Merge pull request #295 from ulmus/restframework2 
Added TextField to serializer
 2012-10-15 04:50:28 -07:00
Jens Alm
c942726509 Added docs, integer fields and refactored models.TextField to use CharField 
I realized that per the django forms, there is no need for a separate
TextField, an unlimited CharField is perfectly good.
Also added default field for the different IntegerField types
 2012-10-15 13:46:44 +02:00
Jens Alm
afbc9684f2 Revert "Support for request-based queryset limits on ListModelMixin" 
This reverts commit de4604be0a.
 2012-10-15 11:49:56 +02:00
Jens Alm
de4604be0a Support for request-based queryset limits on ListModelMixin 
ListModelMixin uses the get_queryset from the MultipleObjectMixin. This
method can be overridden on the View class to return a different
queryset, but get_queryset doesn't accept a request parameter in. This
commit adds the limit_list hook to override if you want to limit the
queryset based on request-information such as the logged in user.
 2012-10-15 11:47:56 +02:00
Jens Alm
36cc56bc9d Added tests for TextField 2012-10-15 10:06:50 +02:00
Jens Alm
241be38340 Added TextField to recognized fields 2012-10-15 09:14:01 +02:00
Tom Christie
41dd63b3b0 Merge branch 'restframework2' of https://github.com/tomchristie/django-rest-framework into restframework2 2012-10-14 22:43:41 +01:00