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
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
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
Teddy Wing
0f5082d9b8
docs/renderers: StaticHTMLRenderer instead of TemplateHTMLRenderer
...
The `StaticHTMLRenderer` section referred to `TemplateHTMLRenderer`
instead of `StaticHTMLRenderer`.
2015-04-16 15:47:53 -04:00
Kevin Brown
ec5c3aa5e7
Merge pull request #2823 from jpadilla/master
...
Django 1.8 is no longer in beta
2015-04-14 16:52:40 -04:00
José Padilla
3abbeadfaf
Django 1.8 is no longer in beta
2015-04-14 11:32:15 -04:00
Tymur Maryokhin
1ddfef1212
Removed deprecated '.model' attribute check
2015-04-12 17:12:01 +02:00
José Padilla
970bfe16ec
Merge pull request #2810 from robhudson/patch-1
...
Update example of nested data
2015-04-09 13:25:01 -04:00
Rob Hudson
e6308155dd
Update example of nested data
2015-04-08 21:38:02 -07:00
Adam Parsons
77460d4bca
Moved ul.breadcrumb margin to bootstrap-tweaks.css
...
When importing other bootstrap themes from sites like bootswatch, the
margin in default.css persists and adds a 70px margin below the header.
This change will remove that margin when users choose to use a different
bootstrap theme.
2015-04-08 20:10:33 -05:00
iorlas
548ac9a65e
Now it is possible to display viewset w/o paginator
...
Since pagination is now included in every generic viewset, we should have ability to disable it and we have it: paginator=None or pagination_class=None. But this piece of code relies on existence of property instead of its value.
2015-04-08 20:32:02 +03:00
Xavier Ordoquy
311cad64c9
Merge pull request #2805 from pstiasny/patch-1
...
Update serializers documentation (removed feature)
2015-04-08 13:58:15 +02:00
Paweł Stiasny
22e8357a4b
Update serializers documentation (removed feature)
...
It seems that allow_add_remove was removed from 3.x, yet the docs still mention it. Updating to avoid confusion.
2015-04-08 13:53:49 +02:00
Xavier Ordoquy
3f0f977b96
Merge pull request #2803 from asparagui/sp_fixes
...
more sp fixes
2015-04-08 08:32:21 +02:00
Brett Koonce
d8a19f79ab
more sp fixes
2015-04-07 22:06:25 -07:00
José Padilla
80d8a1ff8c
Merge pull request #2800 from olmar/patch-2
...
Fix typo.
2015-04-07 12:48:11 -04:00
Oleg Marshev
b0dd1fffbf
Fix typo.
2015-04-07 19:40:23 +03:00
Xavier Ordoquy
0c7f36ecd8
Merge pull request #2795 from jpadilla/test-djangomaster
...
Test against Django's master branch
2015-04-07 08:22:01 +02:00
José Padilla
9844f652a9
Workaround for bug in pip
2015-04-04 22:18:52 -04:00
José Padilla
7228a0df75
Test against Django's master branch
2015-04-04 22:07:11 -04:00
José Padilla
2e6d39dbae
Merge pull request #2754 from bleib1dj/enhancement_dont_require_pk_strictly_related
...
Enhancement dont require pk strictly related #2745
2015-04-04 22:01:06 -04:00
José Padilla
6333e48188
Merge pull request #2753 from johnjohndoe/patch-1
...
Fix typo.
2015-04-03 17:30:52 -04:00
Xavier Ordoquy
73e46d9a7f
Merge pull request #2786 from maryokhin/patch-2
...
Update tox & Travis with Django 1.8 release
2015-04-02 11:17:16 +02:00
Tymur Maryokhin
596093d494
Django 1.8 released
2015-04-02 10:50:53 +02:00
Tom Christie
5cf8230ba1
Merge pull request #2777 from jpadilla/docs-query-params
...
`query_params` in favor of `QUERY_PARAMS`
2015-04-01 09:24:38 -04:00
Kevin Brown
ad8de232c2
Merge pull request #2782 from caffodian/master
...
Should use "ordering" in model Meta, not order_by in Serializer Relations example [documentation]
2015-03-31 20:54:51 -04:00
Alex Tsai
fbd8c18abd
Should use "ordering" in model Meta, not order_by
2015-03-31 17:30:04 -07:00
