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
Igor Zygin
2d5b4f4cc9
Depth should reduce
...
Depth should reduce
2015-04-06 10:13:25 +06: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
Andrea Grandi
d6effbf779
Remove unpack_ipv4 parameter
2015-04-02 19:40:17 +01: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
Martti Malmi
c6b71055fd
Require version param if ALLOWED_VERSIONS is set
...
Documentation: "ALLOWED_VERSIONS. If set, this value will restrict the set of versions that may be returned by the versioning scheme, and will raise an error if the provided version if not in this set."
2015-03-30 11:28:19 +03:00
José Padilla
911da8a2b9
query_params
in favor of QUERY_PARAMS
2015-03-29 17:04:23 -04:00
Kevin Brown
ba951f3339
Merge pull request #2775 from exonian/patch-1
...
Fixed docstring typo
2015-03-27 18:09:36 -04:00
Michael Blatherwick
56ec7b152e
Fixed docstring typo
2015-03-27 18:00:19 +00:00
Andrea Grandi
466575bee6
Lowercase the input
2015-03-26 18:14:53 +00:00
Udi Oron
b95ef25cbb
Wrong error message on bad field lookup
2015-03-26 20:13:35 +02:00
José Padilla
5f3d09a052
Merge pull request #2767 from ckaalund/patch-1
...
Reference typos in fields.md
2015-03-26 10:59:07 -04:00
Christoffer
6cb6b02811
Reference typos in fields.md
2015-03-26 15:51:48 +01:00
Carlton Gibson
aa131ae258
Merge pull request #2764 from jpadilla/2763
...
Use default reason phrases from HTTP standard. Fixes #2763
2015-03-25 21:08:03 +01:00
José Padilla
55ee588f6e
Use default reason phrases from HTTP standard.
...
Closes #2763
2015-03-25 13:27:47 -04:00
Ilias Kiourktsidis
0888f9cfc3
Use _meta instead of Meta on is_abstract_model function
2015-03-25 12:00:20 +00:00
Xavier Ordoquy
ac77a56e43
Merge pull request #2762 from charettes/metadata-null-boolean-field
...
Metadata should detect null boolean field type.
2015-03-25 10:06:19 +01:00
Simon Charette
87208021e2
Metadata should detect null boolean field type.
2015-03-24 21:31:35 -04:00
José Padilla
197027c87b
Fix older release notes link
...
Closes #2756
2015-03-23 12:15:27 -04:00
Tom Christie
331f48054c
Try to resolve pep8 versioning clash.
2015-03-23 15:59:18 +00:00
Devon Bleibtrey
b1c1867b16
Swapping to hassattr logic for pk attribute references in relations
2015-03-23 11:40:33 -04:00
Ilias Kiourktsidis
486f0a9367
Raise error when ModelSerializer used with abstract model
2015-03-23 15:01:19 +00:00
Devon Bleibtrey
7ac3c3fff7
Added enhancement for pk reference in many=True relations
2015-03-23 10:42:42 -04:00
Tom Christie
79ea094544
Downgrade pep8 requirement, due to versioning clash
2015-03-23 14:28:47 +00:00
Tom Christie
5e29724146
Update flake8 dependancy
2015-03-23 14:23:43 +00:00
Tom Christie
98809d12c9
Typo
2015-03-23 11:45:19 +00:00
Tom Christie
bbaee714fb
Fix release date
2015-03-23 11:38:17 +00:00
Tom Christie
54eea7f14a
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2015-03-23 11:37:28 +00:00
Tom Christie
35a0cbb911
Add 3.1.x series header
2015-03-23 11:37:12 +00:00
Tom Christie
a90dbe3bd9
Merge pull request #2724 from delinhabit/namespaced-versioning-non-api-reversal
...
Handle reversal of non-API view_name in HyperLinkedRelatedField
2015-03-23 11:35:21 +00:00
Tom Christie
f7cd7a1c1f
Latest translation strings
2015-03-23 11:32:28 +00:00
Tom Christie
dbb6943298
Update release notes
2015-03-23 11:24:29 +00:00
Tom Christie
e73ddddc3a
Merge pull request #2726 from linovia/release/3.1.1
...
Release notes for 3.1.1 and version bump.
2015-03-23 11:20:23 +00:00
Tom Christie
7872d0acbf
Escape tab switching cookie
2015-03-23 11:20:09 +00:00
Tobias Preuss
49c04d7218
Fix typo.
2015-03-23 11:20:08 +01:00