Commit Graph

5467 Commits

Author SHA1 Message Date
Omer Katz
67ff078388 Renamed the cached fields lists. 2015-05-17 09:54:33 +03:00
Omer Katz
1ee3173583 Cache fields list for to_internal_value and to_representation. 2015-05-09 14:37:49 +03:00
Kevin Brown
35efbe41ab Merge pull request #2917 from respondcreate/master
Adding django-versatileimagefield to DRF 3rd party docs
2015-05-07 16:14:26 -04:00
Jonathan Ellenberger
44317b4581 Adding django-versatileimagefield to DRF 3rd party docs
Closes WGBH/django-versatileimagefield#12
2015-05-07 14:23:24 -04:00
José Padilla
3a96164501 Merge pull request #2914 from trollknurr/master
Added link to djangorestframework-word-filter package
2015-05-06 12:11:04 -04:00
tony
b0b26d6b68 Added link to djangorestframework-word-filter package 2015-05-06 13:40:01 +03:00
José Padilla
a7d5e32193 Merge pull request #2909 from sheppard/update-wq
update info about wq.db.rest router
2015-05-05 16:09:18 -04:00
S. Andrew Sheppard
e9b6b47872 update info about wq.db.rest router 2015-05-05 13:38:14 -05:00
Tom Christie
859c20804c Merge pull request #2907 from mrunge/master
Separate LICENSE and README to two files.
2015-05-05 14:46:49 +01:00
Matthias Runge
04084c96a0 Separate LICENSE and README to two files. 2015-05-05 14:48:30 +02:00
Tom Christie
2e85b4ec3c Merge pull request #2890 from radyz/fixed-doc-for-get-paginated-response-method
Document correct method usage for get_paginated_response
2015-05-05 09:15:28 +01:00
Tom Christie
4db35a2380 Merge pull request #2902 from soloradish/master
Delete imported but not used method
2015-05-05 09:12:15 +01:00
lowid
4996748575 Merge pull request #1 from soloradish/API-Guide-Authentication-patch
Delete imported but not used method
2015-05-04 18:17:17 +08:00
lowid
5c3c4802d3 Delete imported but not used method
In 'Generating Tokens' section, the example code imported get_user_model but not used.
2015-05-04 18:15:49 +08:00
Ernesto Chavez Sanchez
2b4dd739cc Fixed description for get_paginated_response method in generic-views and example using it with @list_route decorator in viewsets. 2015-05-03 22:00:05 +00:00
José Padilla
7932f2c6f8 Merge pull request #2899 from maryokhin/patch-3
Fix Invalid keyword model with generic views
2015-05-02 08:00:41 -04:00
Tymur Maryokhin
d19c3cc973 Remove deprecated model attribute reference. Closes #2896. 2015-05-01 20:32:52 +02:00
Tom Christie
abcd6f2b9e Merge pull request #2869 from ryangallen/datefield
DateField to_representation can handle str and empty values. Fixes #2656, #2687.
2015-05-01 16:33:43 +01:00
Ernesto Chavez Sanchez
0ffb0abe81 Document correct method usage for get_paginated_response in 3.x instead
of old get_pagination_serializer only valid in 2.x
2015-04-30 02:23:39 +00:00
Tom Christie
2eb9107b87 Merge pull request #2798 from Boomerangz/depth-should-reduce
Depth should reduce on nested ModelSerializer classes.
2015-04-27 16:22:22 +01:00
Tom Christie
2394577dc2 Merge pull request #2757 from ekiourk/2630/Raise-exception-when-ModelSerializer-used-with-abstract-model
Raise error when ModelSerializer used with abstract model
2015-04-27 14:47:32 +01:00
José Padilla
2b6726e703 Merge pull request #2842 from frnc/patch-1
Update 5-relationships-and-hyperlinked-apis.md
2015-04-26 12:13:57 -04:00
José Padilla
9809f4d36a Merge pull request #2809 from aparsons/master
Move ul.breadcrumb margin to bootstrap-tweaks.css
2015-04-26 11:15:50 -04:00
Tom Christie
450c541462 Merge pull request #2868 from ticosax/versioning-header-all
Check AcceptHeaderVersioning with content negotiation in place
2015-04-24 15:19:51 +01:00
Tom Christie
c397705217 Merge pull request #2873 from ByteInternet/fix-exception-handler-docs
Remove mention of Django's built-in ValidationError in docstring
2015-04-24 14:43:23 +01:00
Allard Hoeve
9a794beb1e Remove mention of Django's built-in ValidationError in docstring
The `exception_handler` does not actually handle django.core.exceptions.ValidationError, so remove any mention of it.

This closes #2872
2015-04-24 15:37:42 +02:00
Ryan Allen
cbea03c85b DateField to_representation can handle str and empty values. Fixes #2656, #2687. 2015-04-23 19:31:46 -05:00
Tom Christie
3113e8e5f0 Update README.md 2015-04-23 16:07:57 +01:00
Nicolas Delaby
63511c03d0 Check AcceptHeaderVersioning with content negotiation in place 2015-04-23 14:19:39 +02:00
Tom Christie
1fb8b248a1 Merge pull request #2867 from vially/patch-1
Frontpage example no longer uses model attribute
2015-04-23 09:44:31 +01:00
Valentin Hăloiu
e148637d6d Frontpage example no longer uses model attribute 2015-04-23 04:44:10 +03:00
Xavier Ordoquy
8beef4752b Merge pull request #2862 from ticosax/allow-empty-queryset
Prevent empty `queryset`s to raise AssertionError.
2015-04-22 11:31:27 +02:00
Nicolas Delaby
24e9473036 Improve error message. 2015-04-22 11:22:37 +02:00
Nicolas Delaby
6f66798ad3 Prevent empty querysets to raises AssertionError. 2015-04-22 11:13:09 +02:00
Carlton Gibson
fe7cd8475b Merge pull request #2863 from ticosax/rely-on-get_queryset
Tell DjangoModelPermissions to rely on get_queryset first.
2015-04-22 11:06:15 +02:00
Nicolas Delaby
c2e536bfda Tell DjangoModelPermissions to rely on get_queryset first. 2015-04-22 10:18:30 +02:00
Xavier Ordoquy
37be7870ca Merge pull request #2856 from zmmachar/patch-1
Update renderers.md
2015-04-22 09:24:00 +02:00
zmmachar
237c2ebc26 Update renderers.md
jsonp renderer not in the yaml package
2015-04-21 18:09:55 -07:00
Tom Christie
0ca1145456 Merge pull request #2853 from ryangallen/master
Set IntegerField class variable for compiled decimal regex, comment for ...
2015-04-21 16:00:37 +01:00
Ryan Allen
32acc4a72b Set IntegerField class variable for compiled decimal regex, comment for purpose 2015-04-21 10:52:52 -04:00
Tom Christie
605369e2b4 Merge pull request #2807 from iorlas/patch-2
Now it is possible to display viewset w/o paginator
2015-04-21 15:07:11 +01:00
Xavier Ordoquy
86e7702f11 Merge pull request #2845 from Siecje/docs
Specifying module for CurrentUserDefault()
2015-04-21 10:51:00 +02:00
Cody Scott
cbf17a5ffe Specifying module for CurrentUserDefault()
Prevents having to lookup the import
2015-04-20 19:14:58 -04:00
Kevin Brown
5cc0a3c2a8 Merge pull request #2836 from ryangallen/master
only allow integer field to accept integers and strings, fixes #2835
2015-04-20 18:10:40 -04:00
frnc
601cbf18d4 Update 5-relationships-and-hyperlinked-apis.md
Following  [@jpadilla](https://github.com/jpadilla)'s suggestion in issue [#2837](https://github.com/tomchristie/django-rest-framework/issues/2837), I am proposing a little addition in "Creating an endpoint for the root of our API" section in order to make it clear that the `user-list` and `snippet-list` names will be declared later in `snippets/urls.py`. Missing this clarification might lead a beginner (like me) to think that the names are somehow assigned by rest_framework under the hood and to try the code too early, getting stuck in the following errors.
2015-04-20 17:56:04 +02:00
Ryan Allen
1f10a39d31 Match IntegerField validation with Django's, preventing decimal values being stored as ints, fixes #2835.
Match IntegerField validation with Django IntegerField, prevents decimal values being stored as ints, fixes #2835
 On branch master
2015-04-20 11:03:05 -04:00
Adam Parsons
72230a913e Removed color from default 2015-04-18 16:52:20 -05:00
Adam Parsons
324ccc3664 Moved breadcrumb color to bootstrap-tweaks
Moved to color associated with the breadcrumb to the tweaks style sheet.
2015-04-18 16:50:32 -05:00
Tom Christie
ecb37f518e Merge pull request #2818 from maryokhin/master
Don't check for deprecated '.model' attribute in permissions
2015-04-17 16:15:27 +01:00
José Padilla
c6657da5f4 Merge pull request #2831 from teddywing/docs-renderers-use-appropriate-renderer-class-name
docs/renderers: `StaticHTMLRenderer` instead of `TemplateHTMLRenderer`
2015-04-16 16:20:43 -04:00