encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-29 13:04:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,106 Commits 18 Branches 132 Tags 105 MiB
68d2020112
Commit Graph

2295 Commits

Author SHA1 Message Date
Tom Christie
53a356a380 Fix docs link [ci skip] (#4165) 2016-06-02 10:35:18 +01:00
sohopro
20e3a9a006 Update filtering.md 2016-06-02 16:12:35 +09:00
Adam Chainz
e3337ab4aa Convert readthedocs link for their .org -> .io migration for hosted projects 
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
 2016-05-29 23:26:56 +01:00
Tom Christie
8e082770b0 Premium sponsor link 2016-05-28 10:55:38 +01:00
Tom Christie
9895de990d Fix signup URLs 2016-05-28 10:23:59 +01:00
Tom Christie
3a173547ad Funding announcement (#4147) 2016-05-26 11:48:15 +01:00
Carlton Gibson
9d87dbc016 Remove Py2/Py3 difference from Example (#4145) 
`print` is available as a function on every supported version of Python (2.7+)
 2016-05-25 14:38:44 +01:00
Tom Christie
9b56dda918 Update requests.md 
Drop out-of-date paragraph on `request.content`
 2016-05-18 08:38:18 +01:00
Joe Simpson
5cf7d4a90d Add LaTeX renderer to documentation (#4131) 2016-05-17 12:09:25 +01:00
Petros Moisiadis
788603e153 Document allow_empty argument (#4117) 
ListSerializer fields or serializers that are passed many=True may also take an allow_empty=False argument to disallow empty lists as valid input.

Information about this was part of the 3.2 release announcement, but had not been part of the API docs until now.
 2016-05-13 15:55:31 +01:00
Graham R. Jeffries
dbbf79be64 minor docs indentation fix (#4101) 
Fixes a minor indentation typo.
 2016-05-06 11:58:58 +01:00
Miro Hrončok
ffdac0d936 TokenAuthentication: Allow custom keyword in the header (#4097) 
This allows subclassing TokenAuthentication and setting custom keyword,
thus allowing the Authorization header to be for example:

    Bearer 956e252a-513c-48c5-92dd-bfddc364e812

It doesn't change the behavior of TokenAuthentication itself,
it simply allows to reuse the logic of TokenAuthentication without
the need of copy pasting the class and changing one hardcoded string.

Related: #4080
 2016-05-04 10:53:34 +01:00
Taylor Edmiston
c355cdc585 Fix typo in permissions docs 2016-05-03 14:20:45 -04:00
Kyle Hornberg
399e1c1dcf Typo fix (#4094) 2016-05-03 15:53:55 +01:00
Xavier Ordoquy
a9bbb502cb Remove references to South as we don't need it any longer. (#4085) 
* Remove references to South as we don't need it any longer.
* Add a note about auth_token including Django migrations.
 2016-04-29 14:16:03 +01:00
Xavier Ordoquy
1823662e1e Merge pull request #4044 from linovia/merge/3.3.x_to_master 
Merge the changes in 3.3.x back to master.
 2016-04-21 11:31:15 +02:00
Xavier Ordoquy
bff3bebdbe Merge remote-tracking branch 'reference/stable/3.3.x' into merge_test 
# Conflicts:
#	docs/topics/release-notes.md
 2016-04-08 15:46:17 +02:00
Xavier Ordoquy
95418eb8ac Add the medium collection related to Django REST framework. (#4043) 2016-04-08 14:43:10 +01:00
Raphael Gyory
b870101581 Update third-party-resources.md 2016-04-06 17:00:26 +02:00
Raphael Gyory
f1a384b61b Add Django Rest Messaging in Third party packages 2016-04-06 16:58:15 +02:00
Anthony Lukach
3fdd6e1db5 Add .partial_update to ModelViewSet documentation 
The ModelViewSet inherits from the UpdateModelMixin, which provides the `.partial_update` method. This should be reflected in the documentation.
 2016-03-29 10:50:12 -06:00
Tom Viner
3e5a1397d7 remove trailing slash from cramer cursor link 2016-03-24 20:37:38 +00:00
S. Andrew Sheppard
101c178b8c links to html-json-forms package 2016-03-24 11:55:19 -05:00
Xavier Ordoquy
0e8306341d Merge pull request #3936 from carltongibson/null-uuid-fk-take2 
Fix None UUID ForeignKey serialization
 2016-03-22 22:46:33 +01:00
Stephan Groß
0056703fe8 Fix code sample indention 2016-03-21 10:23:34 +00:00
Stephan Groß
3785281d4c Add missing paginator in docs 2016-03-21 10:07:47 +00:00
Stephan Groß
91e869750e Fix typo 2016-03-21 08:57:43 +00:00
Xavier Ordoquy
f0fc339278 Release date update. 2016-03-14 08:40:00 +01:00
aleontiev
3a3fd66852 documentation: add a reference to the dynamic-rest addons under the serializers guide 2016-03-11 12:43:17 -05:00
Xavier Ordoquy
c91229aaab PAGINATE_BY_PARAM and MAX_PAGINATE_BY removed in 3.3 2016-03-08 06:41:08 +01:00
Xavier Ordoquy
c90cf828ae PAGE_SIZE addition in 3.1 2016-03-08 06:40:33 +01:00
Xavier Ordoquy
180137300f PAGINATE_BY removed in 3.3 2016-03-08 06:39:58 +01:00
Xavier Ordoquy
a0aac166bc DEFAULT_PAGINATION_SERIALIZER_CLASS removed in 3.1 2016-03-08 06:39:08 +01:00
Xavier Ordoquy
9208619362 Those are now fully removed. 2016-03-08 06:38:03 +01:00
Xavier Ordoquy
cac1ecb250 paginate_by removed in 3.3 2016-03-08 06:37:46 +01:00
Krzysztof Szularz
cfd681dc73 Add /en to Heroku guidelines link 2016-03-07 21:01:04 +01:00
ildoc
2e2abbc811 updated tutorial for django 1.9 2016-03-07 20:59:58 +01:00
meoooh
0a2a01d05a fix typo 
fix typo
 2016-03-07 20:58:47 +01:00
Wes
0e1dcb7323 fix typo 2016-03-07 20:58:24 +01:00
Kin
b572cdb068 fix typo 2016-03-07 20:58:12 +01:00
Xavier Ordoquy
6ea9a41408 Add #3962 in the last minute fixes. 2016-03-07 20:39:34 +01:00
Xavier Ordoquy
173c2f1e53 Release date update. 2016-03-07 20:22:47 +01:00
Luke Murphy
ef8e7f168f add rest-framework-generic-relations link to docs 2016-03-07 19:37:30 +01:00
José Padilla
b3582cd36b Merge pull request #3973 from lwm/docs-generic-relations 
add rest-framework-generic-relations link to docs
 2016-03-01 13:54:44 -04:00
Luke Murphy
66e86dc483 add rest-framework-generic-relations link to docs 2016-03-01 18:44:17 +01:00
Krzysztof Szularz
2ddd30be90 Add /en to Heroku guidelines link 2016-03-01 14:52:07 +01:00
Xavier Ordoquy
97cc83483f Merge remote-tracking branch 'reference/stable/3.3.x' into stable/3.3.3 2016-03-01 10:39:34 +01:00
Xavier Ordoquy
0324429107 Add #3968 to the release notes. 2016-03-01 10:39:13 +01:00
Rex Kerr
f3b4cb5951 Fixes incorrect references to URLPathVersioning 2016-03-01 10:36:05 +01:00
Liping Wang
239815887d remove comma 
remove comma
 2016-03-01 10:35:41 +01:00
Liping Wang
05204333a5 [FIX] "@api_view" calling error. 
"@api_view" usage error.
 2016-03-01 10:35:41 +01:00
Liping Wang
c3cea1499f remove comma 
remove comma
 2016-03-01 15:46:20 +08:00
Liping Wang
d372ccca02 [FIX] "@api_view" calling error. 
"@api_view" usage error.
 2016-02-29 19:51:33 +08:00
Rex Kerr
88320b8a61 Fixes incorrect references to URLPathVersioning 2016-02-27 12:41:56 -08:00
Xavier Ordoquy
24a2ec0501 Merge remote-tracking branch 'reference/stable/3.3.x' into stable/3.3.3 2016-02-27 00:36:23 +01:00
Taranjeet
a609e4e1ca Docs: Fix repetitive word in the tutorial 2016-02-27 00:28:15 +01:00
Luke Murphy
c03c6c6e78 fix typo in relations docs 2016-02-27 00:27:41 +01:00
Tom Christie
a15e46af88 Merge pull request #3965 from ildoc/master 
updated tutorial for django 1.9
 2016-02-25 21:37:27 +00:00
Taranjeet
3fd6db1445 Docs: Fix repetitive word in the tutorial 2016-02-26 00:02:45 +05:30
ildoc
35036aee15 updated tutorial for django 1.9 2016-02-25 14:27:57 +01:00
Luke Murphy
f3c5802872 fix typo in relations docs 2016-02-24 14:22:24 +01:00
José Padilla
0b6f53eb98 Merge pull request #3943 from erickwilder/3937-accept-callable-as-initial-value 
Closes #3937. Support callable as the value of `initial` for any `serializer.Field`
 2016-02-19 10:41:23 -04:00
Erick Wilder
a32baeab0c Use datetime example for the Field.initial attribute 
Just like regular Django fields, the example adopted uses a `datetiume.date.today` to
illustrate the functionality.
 2016-02-19 09:53:50 +01:00
meoooh
5cda3a04dd fix typo 
fix typo
 2016-02-18 14:43:41 +09:00
José Padilla
bec5f3db83 Merge pull request #3941 from wesgt/master 
fix typo
 2016-02-17 07:11:36 -04:00
Erick Wilder
908efd6656 #3937 Update docs for the Field.initial attribute. 
Add an usage example on how to pass a callable to the `Field.initial` in the docs.
 2016-02-17 11:01:09 +01:00
Wes
b773f03bd0 fix typo 2016-02-17 16:35:53 +08:00
Kin
96644bd6c1 fix typo 2016-02-16 23:08:45 -08:00
Carlton Gibson
20d1fdba69 Fix None UUID ForeignKey serialization 2016-02-16 09:29:48 +01:00
Carlton Gibson
296c567645 Drop EOL Django 1.7 2016-02-15 16:07:42 +01:00
Xavier Ordoquy
c8ca3a1c05 Release notes for 3.3.3 2016-02-11 07:14:45 +01:00
Christian Berendt
ff4d7c7e07 Use 'password123' as password for new users in the tutorial 
Trying to create a new user on Django 1.9.x with the password 'password'
will fail with the error message 'This password is too common.'. Because
of that it is necessary to change the used password from 'password' to
'password123'.
 2016-02-04 07:26:15 +01:00
Chirag Khatri
62551bc80f typo in tutorial part 1 2016-02-03 15:25:31 +05:30
Xavier Ordoquy
d738ad7ae6 Update to serialization results (closes #3881). 2016-01-27 22:23:20 +01:00
James Beith
34901a5ffa Fix syntax errors in docs example 
- Add missing comma in kwargs
- Remove spaces around keyword / parameter equals
- Replace incorrect curly brace with parenthesis
 2016-01-24 13:33:18 +00:00
Emmanouil Konstantinidis
ee2861887e Mention DRF Docs - Live API Endpoints 2016-01-23 23:08:19 +00:00
José Padilla
99a61d72a7 Fix broken link format 2016-01-20 14:04:04 -04:00
Xavier Ordoquy
f1b28b4d63 Merge pull request #3605 from ryanhiebert/slug-related-field-queryset 
RelatedField get_queryset and context
 2016-01-20 18:17:29 +01:00
Krzysztof Szularz
2d40be5bd8 Update link to Heroku guidelines 
They seem to have changed the structure of the document.
 2016-01-20 16:28:30 +01:00
Xavier Ordoquy
221d6979c6 Fix the request data source. 2016-01-18 18:54:00 +01:00
Xavier Ordoquy
0051492963 Merge remote-tracking branch 'shvechikov/master' into feature/3776 2016-01-18 18:51:53 +01:00
Xavier Ordoquy
6f8e0c3c07 Merge pull request #3289 from koliber/update-docs-serilaizers-multi-update 
Added explicit id field in multi update example
 2016-01-18 18:44:03 +01:00
Ramon Moraes
a37a8748cc Update permissions.md 
Adding additional note about the behavior of set permission classes per view as suggest on #3834
 2016-01-15 11:44:25 -03:00
Nicolas Delaby
717e27c866 Document how to tweak authtoken.admin.TokenAdmin 
With focus on large user base, but can be extended.
 2016-01-14 14:59:31 +01:00
Tom Christie
1c5dfc9c8d Merge pull request #3821 from zwernberg/master 
update copyright 2016
 2016-01-11 16:25:11 +00:00
Zach Wernberg
04b2f021a6 update copyright 2016 2016-01-11 08:13:07 -06:00
Jerel Unruh
f71d8afdb0 Added documentation for the Third Party jsonapi.org package 2016-01-07 13:42:02 -06:00
m1kola
5fa8a31855 Typo fix in docs/api-guide/relations.md 
`slug field` in code snippet was replaced to `slug_field`
 2016-01-06 17:58:45 +03:00
craigglennie
2d7d3b79a0 Make code block consistent in serialization tutorial 
All the other code blocks in the Serialization tutorial can be copied and pasted, but there is one that includes the >>> shell prompt characters. This commit removes those characters, and also makes the output consistent with other code blocks by making it a comment.
 2016-01-02 13:15:25 -08:00
Luis San Pablo
183f8fad44 Class formatting 2015-12-31 21:18:41 -06:00
Luis San Pablo
ef491685a0 Initial fixes #3636 and fixes #3637 2015-12-31 21:14:57 -06:00
Leonid Shvechikov
ff0292a757 Fix update model example in html-and-forms.md 2015-12-27 17:14:33 +03:00
Robert Romano
c8915c0716 Change tab to spaces 2015-12-23 12:58:14 -08:00
Robert Romano
5fc938cbd1 The Internet Engineering Task Force approved the new HTTP status code 451. Adding to status.py and docs appropriately. 2015-12-23 12:54:17 -08:00
Emmanouil Konstantinidis
1925ec7d33 Both are highly recommended 2015-12-21 13:59:05 +00:00
Emmanouil Konstantinidis
4204557bc5 Remove title and hr 2015-12-21 13:55:11 +00:00
Emmanouil Konstantinidis
958290724c Rest is "REST" 2015-12-21 13:47:04 +00:00
Emmanouil Konstantinidis
a83cb1d2f3 Minor changes 2015-12-21 13:45:11 +00:00
Emmanouil Konstantinidis
1aedaafba4 Add DRF docs to the list 2015-12-21 13:40:23 +00:00
Atul Varma
66de876dee Update bootstrap version in browsable-api.md 2015-12-19 10:34:39 -05:00
Peter Baehr
44ae037e81 Move urls.py changes down and add necessary import 
The previous location of editting urls.py did not allow migrations to be created and the default import needs to be modified
 2015-12-15 21:17:52 -05:00
Tyrel Souza
8c0d736f23 Also fix usecases to use cases 2015-12-15 10:28:23 -05:00
Tyrel Souza
ffc10edd7e Fix minor typo on Pagination documentation 2015-12-15 10:24:49 -05:00
Xavier Ordoquy
5224feded4 Update the release date. 2015-12-14 07:32:50 +01:00
Xavier Ordoquy
bf18c9f6e3 3.3.2 release notes. 2015-12-14 07:22:30 +01:00
Xavier Ordoquy
dcaff71217 Merge pull request #3728 from karthik-suresh/Fixes-Issue3727 
Import parser added to docs in API guide
 2015-12-12 22:19:13 +01:00
Karthik Suresh
82973cfa32 Import parser added to docs in API guide 
Added missing import statements in code snippet of API guide.

Closes-Issue: #3727
 2015-12-12 21:59:08 +05:30
knbk
e203967e09 Add app_name to rest_framework.urls. 
This allows users in Django 1.9+ to include the authentication urls
without specifying the namespace, as in:

    urlpatterns = [
        ...
        url(r'^auth/', include('rest_framework.urls'))
    ]
 2015-12-08 02:25:00 +01:00
Kirill Zaborsky
85db6a681b Fixed versioning regexp 
booking list regexp was fixed in 8b97bb8f68 but single booking wasn't for some reason, and `v1v2/bookings/123/` shouldn't be allowed here
 2015-12-07 10:59:57 +03:00
Tom Christie
832d6322a7 Merge pull request #3631 from syphar/paginat 
allow setting a custom Django Paginator class
 2015-11-30 20:58:32 +00:00
Tom Christie
bd8098e31f Fix template typo. 
Closes #3682.
Thanks for the report!
 2015-11-30 17:21:41 +00:00
Nik Nyby
e3f62e230c Add missing link to django-crispy-forms 2015-11-30 10:48:56 -05:00
Prashant Tiwari
8b97bb8f68 Fix for Incorrect regex in URLPathVersioning documentation #3638 2015-11-26 06:23:59 +00:00
Xavier Ordoquy
d0352ae6fc Merge pull request #3621 from linovia/feature/how_to_turn_pagination_off 
Document how to turn pagination off
 2015-11-25 12:57:25 +01:00
Daniel Hahler
e786e4c4a1 doc: clarify that crispy-forms needs to be in INSTALLED_APPS 2015-11-23 15:05:38 +01:00
Xavier Ordoquy
f3de2146ea Merge pull request #3650 from silviogutierrez/master 
Documentation fix for list serializers.
 2015-11-19 07:46:01 +01:00
Silvio J. Gutierrez
ece7973479 Updated comment. 2015-11-18 21:52:20 -05:00
Xavier Ordoquy
edc5a79b85 Merge pull request #3497 from Ins1ne/feature/3340 
update docs about detail page link for AdminRenderer
 2015-11-18 17:38:07 +01:00
Silvio J. Gutierrez
f7646627f1 Documentation fix for list serializers. 2015-11-17 19:09:49 -05:00
Will Dady
ca0841576f Removing references to get_paginate_by() as it no longer exists. 2015-11-17 15:00:00 +11:00
Denis Cornehl
3806af3d15 allow setting a custom Django Paginator in pagination.PageNumberPagination 2015-11-13 16:04:12 +01:00
Xavier Ordoquy
23460bfa41 Add a note about how to turn pagination off 2015-11-10 11:33:54 +01:00
Ryan Hiebert
f2452936e9 Allow no queryset when get_queryset overridden 
The user may wish to provide a dynamic queryset on a `RelatedField`
based on the `context`. The way to do that is to create a subclass of
`RelatedField` (or a child) and override the `get_queryset` method.
However, this is undocumented, and instantiating that field without a
`queryset` argument (because it's not needed) will raise an assertion
error.

Document `.get_queryset(self)` as an official part of the API of
`RelatedField`, and don't enforce the use of `queryset` when
`get_queryset` is overridden.
 2015-11-05 17:34:02 -06:00
Vedran Karačić
ede15645e0 Typo 2015-11-05 11:51:29 +01:00
Tom Christie
d959c6337a Release notes 2015-11-04 14:59:09 +00:00
Tom Christie
bfdf795843 Merge pull request #3592 from tomchristie/request-parsing-when-post-accessed 
Request parsing when .POST accessed
 2015-11-04 14:17:55 +00:00
Ryan Hiebert
b86e5af878 reverse needs kwargs keyword 
Since we aren't passing in any args, we must specify kwargs as a keyword
argument.
 2015-11-03 21:45:21 -06:00
Travis J Morton
03cb959416 typo 2015-11-02 12:58:21 -08:00
David Szotten
9a14613f41 fix image paths 2015-11-02 15:28:02 +00:00
James Beith
0143586541 Adds import for Response 2015-10-29 15:48:45 +00:00
Matthew Hardwick
86e1d2a1e5 Actually add the link. 2015-10-29 10:43:57 -04:00
Matthew Hardwick
f7289e6392 Added django-rest-framework-version-transforms. 2015-10-29 10:37:46 -04:00
Josep Cugat
5b7de4f537 Fix announcement link typo 2015-10-29 10:21:46 +01:00
Tom Christie
bb555e6e5e Version 3.3.0 2015-10-28 11:32:15 +00:00
Tom Christie
144cff97fa Include billing addresses in funding sign ups 2015-10-28 11:20:35 +00:00
Tom Christie
eeff5a1709 Merge branch 'master' into funding 2015-10-23 16:27:30 +01:00
Tom Christie
b2fb0deb34 Add latest item to the release notes 2015-10-23 16:15:44 +01:00
Tom Christie
0fb1ebcfcf Remove unused import 2015-10-23 16:07:48 +01:00
Tom Christie
ff285cfe66 TODO placeholder in release announcement 2015-10-22 15:15:55 +01:00
Tom Christie
7bfc420dc9 Add release notes, drop deprecated test 2015-10-22 15:11:10 +01:00
Tom Christie
4e7cc68ec9 Link tweaks 2015-10-22 14:42:35 +01:00
Tom Christie
ae852b2be4 Tweak links 2015-10-22 14:08:19 +01:00
Tom Christie
cf33008571 Release notes etc 2015-10-22 14:05:52 +01:00
Tom Christie
c53c9eddfe Merge pull request #3315 from tomchristie/filters 
First pass at HTML rendering for filters
 2015-10-22 11:42:35 +01:00
Tom Christie
0c6d46729c Docs on the filter HTML interface 2015-10-22 11:37:27 +01:00
Tom Christie
6305ae8916 Merge pull request #3475 from tomchristie/forms-api 
Forms API
 2015-10-22 09:59:57 +01:00
Peter Demin
423e0de358 Fixed grammar in docs for "Writable nested serializers" 2015-10-21 09:33:34 -04:00
potpath
9634cea474 Fix broken link caused by case sensitivity 2015-10-21 18:43:07 +07:00
Tom Christie
0d1637d666 Minor docs update 2015-10-20 10:49:39 +01:00
agconti
6757da5aab docs(third-party-resources): added cookiecutter-django-rest to misc third party resources 2015-10-18 20:13:09 -04:00
Pierre Dulac
dc72fb4746 Missing the source= keyword for the URLField parameter 2015-10-16 19:43:00 +02:00
Zack Tanner
6fe021eea7 Various typo fixes 2015-10-14 19:09:11 -07:00
Aider Ibragimov
4a6d27ccbb update style of the note 2015-10-14 17:04:47 +03:00
Aider Ibragimov
5342f22009 return typo back for new pr, update docs 2015-10-14 15:54:43 +03:00
Aider Ibragimov
b19865f88d fix typo in adding jquery string, update docs about detail page link for AdminRenderer 2015-10-14 15:14:35 +03:00
Tom Christie
90247afe29 Docs on Forms API 2015-10-12 21:14:58 +01:00
demokrates
47c9d2a4d3 Update versioning.md 
Changed settings attribute 'VERSION_PARAMETER' --> to 'VERSION_PARAM'.
 2015-10-12 10:10:08 +02:00
Tom Christie
41182c6f06 Formns API 2015-10-06 10:58:20 +01:00
Philip Garnero
3cdd3c5f6e Added django-rest-framework-social-oauth2 to list of third party packages 2015-10-02 14:30:27 -07:00
Andrew
f60c0e99f6 Small doc typo throttles --> throttling 2015-10-01 14:25:04 +07:00
Rolf Håvard Blindheim
0e56b2ea74 Added drf-haystack to third party resources 2015-09-30 10:24:21 +02:00
Tom Christie
265ec8ac62 Handle binary or unicode with JSONField 2015-09-28 17:47:51 +01:00
Tom Christie
10dbf1316f Added JSONField. Closes #3170. 2015-09-28 17:25:52 +01:00
Tom Christie
bae47b7f36 Merge pull request #3453 from tomchristie/remove-content-overriding 
Remove content overriding
 2015-09-28 16:42:42 +01:00
Tom Christie
ed677f0138 Update docs for content overriding 2015-09-28 16:37:48 +01:00
Tom Christie
c64896c849 More cleanup of browser overrides 2015-09-28 15:33:55 +01:00
Tom Christie
02e1f69d2b Django 1.9 support 2015-09-28 11:44:07 +01:00
Tom Christie
2d0b54e263 Merge branch 'drop-django-16' oft https://github.com/carltongibson/django-rest-framework into carltongibson-drop-django-16 
Conflicts:
	docs/topics/release-notes.md
 2015-09-28 11:17:48 +01:00
Tom Christie
ca8313aeac Merge branch 'master' into version-3.3 
Conflicts:
	docs/topics/release-notes.md
 2015-09-28 10:57:14 +01:00
Carlton Gibson
8d740a11e4 Adjust README and Release Notes 2015-09-22 16:39:25 +02:00
Carlton Gibson
2aa33ed544 Adjust README and Release Notes 2015-09-21 20:23:39 +02:00
Xavier Ordoquy
6ee3e29460 Add #3415 to the 3.2.4 release 2015-09-21 13:28:59 +02:00
Xavier Ordoquy
1054ea559c Fix the issue link. 2015-09-21 13:28:37 +02:00
Xavier Ordoquy
26715c2dae Merge remote-tracking branch 'origin/master' into release/3.2.4 2015-09-21 13:25:49 +02:00
Xavier Ordoquy
d85e7b9ccc Update Release notes for 3.2.4. 2015-09-20 22:03:52 +02:00
Yiyo
7df11078ee Improved Serializer relations docs 2015-09-17 10:30:22 -05:00
Tom Christie
a3067bea55 Merge branch 'master' into version-3.3 2015-09-17 16:24:46 +01:00
James McMahon
6baca94830 added knox package reference to 3rd party auth apps 2015-09-14 19:34:07 +01:00
Tom Christie
b7d77d5bf2 Merge pull request #3396 from qqbuby/3395 
fix issue #3395
 2015-09-14 10:22:20 +01:00
qqbuby
1aa16caffe append a space after the comment mark to remain consistent with the other parts of the tutorial 2015-09-13 20:24:22 +08:00
Nic Young
5c076e10bb Add link to serpy serialization, fixes #3391 2015-09-12 23:04:18 -07:00
qqbuby
1a8f9d0a0f fix issue #3395 to correct the output text at line 184in docs/tutorial/1-serialization.md 2015-09-12 01:36:40 +08:00
Tom Christie
a67eed1466 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-09-11 13:06:18 +01:00
Tom Christie
ab296ced4e Add link to django REST marshmallow 2015-09-11 13:06:09 +01:00
Nic Young
4704da9a1a Add note about field level validation, fixes #3306 
The documentation added warns the user that field level validation will
be skipped if the field is declared on the model with the parameter
`required=False`.
 2015-09-10 22:55:55 -07:00
Xavier Ordoquy
cd4c389d1f Merge pull request #3382 from outime/patch-1 
Fixed typo in ScopedRateThrottle example views
 2015-09-10 10:16:29 +02:00
Xavier Ordoquy
b6b33b567e Merge pull request #3360 from lubomir/improve-docs-for-default 
Improve documentation of default argument for fields
 2015-09-10 10:15:17 +02:00
Rubén Díaz
671de792e2 Fixed typo in ScopedRateThrottle example views 2015-09-10 10:19:40 +03:00
potpath
bb95de13bf Update 6-viewsets-and-routers.md 2015-09-04 16:07:20 +07:00
Tom Christie
7905e9f9f4 Docs tweak 2015-09-03 11:57:11 +01:00
Lubomír Sedlář
a57ad07674 Add link to validators 
The `set_context` method there is the same as for the default field.
 2015-09-03 10:35:28 +02:00
Lubomír Sedlář
1c049edd8c Improve documentation of default argument for fields 
The documentation now not only mentions that callables are acceptable
arguments, it also tells the reader what the callable should look like.
 2015-09-03 09:46:54 +02:00
Britt Dawn
7c12a988fa Replacing self.tag with self.tag_name in Generic Relationships documentation. 2015-09-02 09:25:00 -07:00
Miroslav Shubernetskiy
6926c71699 added django-url-filter to 3rd party libraries 2015-08-31 21:23:11 -04:00
José Padilla
9dd1b2516b Update ModelSerializer fields docs 2015-08-28 09:51:11 -04:00
koliber
dae5426e20 Changed formatting and updated docs 2015-08-28 15:35:32 +02:00
Tom Christie
3a0d54c7fb Fix testing example. Closes #3346 2015-08-28 13:52:18 +01:00
José Padilla
1fe8e9a0bf Add note on deprecation path 2015-08-28 08:11:07 -04:00
José Padilla
f3ef13ab59 Update to match docs on ModelForm fields 2015-08-28 08:05:20 -04:00
Tom Christie
9aca6442a7 Add to the roadmap 2015-08-27 15:31:21 +01:00