Commit Graph

3522 Commits

Author SHA1 Message Date
Tom Christie
19f9adacb2 Merge branch 'master' into display-raw-data 2013-08-29 20:52:46 +01:00
Tom Christie
02b6836ee8 Fix breadcrumb view names 2013-08-29 20:51:51 +01:00
Tom Christie
e4d2f54529 Fix indenting on raw data forms 2013-08-29 20:39:05 +01:00
Tom Christie
44f8d1bef2 Fix tab preferences on PUT forms 2013-08-29 20:38:55 +01:00
Tom Christie
1fa2d823cc Preserve tab preference in cookies. 2013-08-29 20:35:59 +01:00
Tom Christie
556b4bbba9 Added note on botbot IRC archives 2013-08-29 20:04:00 +01:00
Tom Christie
ac0fb01be3 Update release notes. 2013-08-29 19:31:36 +01:00
Tom Christie
4b46de7dce Added @diox for fix #1074. Thanks! 2013-08-29 19:31:36 +01:00
Tom Christie
c7f3b8bebe Include serialized content in raw data form. 2013-08-29 17:23:26 +01:00
Tom Christie
cf2033f8bf Merge pull request #1074 from diox/choicefield-empty-value
Make ChoiceField.from_native() follow IntegerField behaviour on empty values
2013-08-29 09:20:38 -07:00
Mathieu Pillard
11071499a7 Make ChoiceField.from_native() follow IntegerField behaviour on empty values 2013-08-29 18:10:47 +02:00
Tom Christie
ac4cd50a7b Merge pull request #1073 from asparagui/minor_sp_generic_views
minor sp
2013-08-29 07:26:34 -07:00
Brett Koonce
da9c17067c minor sp 2013-08-29 09:23:34 -05:00
Tom Christie
37e2720a40 Add override_method context manager and cleanup. 2013-08-29 12:55:56 +01:00
Tom Christie
6f8acb5a76 Added @niwibe
For docs addition #1070 - Thanks!
2013-08-29 09:31:12 +01:00
Tom Christie
58539fd00b Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2013-08-29 08:53:48 +01:00
Tom Christie
bf07b8e616 Better docs for customizing dynamic routes. Refs #908 2013-08-29 08:53:19 +01:00
Tom Christie
b39d71a62f Merge pull request #1070 from niwibe/docs/add-composed-permissions-entry
Add composed-permissions entry to the api-guide.
2013-08-29 00:02:28 -07:00
Craig de Stigter
94cd136943 add transform_<fieldname> methods to serializers, which basically do the opposite of validate_<fieldname> on a per-field basis. 2013-08-29 17:35:15 +12:00
Andrey Antukh
2d37952e78 Add composed-permissions entry to the api-guide. 2013-08-29 00:52:07 +02:00
Tom Christie
18007d6846 Simplifying raw data renderering support 2013-08-28 21:52:56 +01:00
Tom Christie
2d5e14a8d3 Throttles now use HTTP_X_FORWARDED_FOR, falling back to REMOTE_ADDR to identify anonymous requests 2013-08-28 15:32:41 +01:00
Tom Christie
711fb9761c Update release notes. 2013-08-28 13:35:27 +01:00
Tom Christie
97b52156cc Added .cache attribute on throttles.
Closes #1066.  More localised than a new settings key, and more
flexible in that different throttles can use different behavior.
Thanks to @chicheng for the report! :)
2013-08-28 13:34:14 +01:00
Tom Christie
d7224afe54 Added @alexander-akhmetov.
For work on MAX_PAGINATE_BY, #1063.  Thanks! :)
2013-08-28 12:57:29 +01:00
Tom Christie
848567a0cd Docs for MAX_PAGINATE_BY setting & view attribute. 2013-08-28 12:55:49 +01:00
Tom Christie
4c53fb883f Tweak MAX_PAGINATE_BY behavior in edge case.
Always respect `paginate_by` settings if client does not specify page
size.  (Even if the developer has misconfigured, so that `paginate_by >
max`.)
2013-08-28 12:52:38 +01:00
Tom Christie
e1b54f2a2a Merge branch 'max_paginate_by' of git://github.com/alexander-akhmetov/django-rest-framework into alexander-akhmetov-max_paginate_by 2013-08-27 20:58:30 +01:00
Alexander Akhmetov
7fb3f078f0 fix for python3 2013-08-27 17:42:10 +04:00
Tom Christie
ea6eee304c Note 'request.session' as available on requests. 2013-08-27 12:37:55 +01:00
Tom Christie
b54cbd292c Use view.settings for API settings, to make testing easier. 2013-08-27 12:36:06 +01:00
Tom Christie
b430503fa6 Move exception handler out of main view 2013-08-27 12:32:33 +01:00
Tom Christie
dce47a11d3 Move settings into more sensible ordering 2013-08-27 12:32:13 +01:00
Tom Christie
8d590ebfde First hacky pass at displaying raw data 2013-08-27 11:22:19 +01:00
Tom Christie
c3e273a90e Added @kristianoellegaard.
For docs addition #1059.  Thanks!
2013-08-27 09:16:20 +01:00
Tom Christie
f254ec3e6e Merge pull request #1059 from KristianOellegaard/patch-1
More information on how actions are mapped to URLs in viewsets
2013-08-27 01:14:43 -07:00
Alexander Akhmetov
316de3a8a3 Added max_paginate_by parameter 2013-08-26 20:14:17 +04:00
Kristian Øllegaard
afee470aca More information on how actions are mapped to URLs in viewsets 2013-08-26 11:02:01 +02:00
Tom Christie
2340035789 Added @ericbuehl
For pull request #1058.  Thank you! :)
2013-08-25 20:48:10 +01:00
Tom Christie
ab68d355f5 Merge pull request #1058 from ericbuehl/master
parameterize identity field serializer class to allow for easier subclassing
2013-08-25 12:46:11 -07:00
Tom Christie
53d60543c3 Add warning against HTMLFormRenderer 2013-08-25 20:31:04 +01:00
Eric Buehl
9d3fae27fd parameterize identity field class to allow for easier subclassing 2013-08-23 16:48:32 +00:00
Tom Christie
c7847ebc45 Docs for HTMLFormRenderer 2013-08-23 17:10:50 +01:00
Tom Christie
be0f5850c3 Extra docs 2013-08-23 16:51:34 +01:00
Tom Christie
c77e4a2c59 Merge branch 'master' into html-form-renderer 2013-08-23 16:46:14 +01:00
Tom Christie
436e66a42d JSON responses should not include a charset 2013-08-23 16:45:55 +01:00
Tom Christie
e23d588852 Adding standard renderer attributes and documenting 2013-08-23 16:16:41 +01:00
Tom Christie
10d386ec6a Cleanup and dealing with empty form data. 2013-08-23 16:10:20 +01:00
Tom Christie
1c935cd3d2 Fix failing test for router with no trailing slash 2013-08-23 15:18:47 +01:00
Tom Christie
005f475c6a Don't consume .json style suffixes with routers.
When trailing slash is false, the lookup regex should not consume '.'
characters.  Fixes #1057.
2013-08-23 14:58:06 +01:00