encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-02-17 03:51:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add 3.0 master merge note

Browse Source
This commit is contained in:
Tom Christie 2014-11-03 14:47:10 +00:00
parent dd14c6c88b
commit 7b2ed10223
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
index.html
View File

@ -95,6 +95,7 @@ a.fusion-poweredby {
<li><a href="http://www.django-rest-framework.org/api-guide/serializers">Serializers</a></li>
<li><a href="http://www.django-rest-framework.org/api-guide/fields">Serializer fields</a></li>
<li><a href="http://www.django-rest-framework.org/api-guide/relations">Serializer relations</a></li>
<!--<li><a href="http://www.django-rest-framework.org/api-guide/validators">Validators</a></li>-->
<li><a href="http://www.django-rest-framework.org/api-guide/authentication">Authentication</a></li>
<li><a href="http://www.django-rest-framework.org/api-guide/permissions">Permissions</a></li>
<li><a href="http://www.django-rest-framework.org/api-guide/throttling">Throttling</a></li>
@ -218,6 +219,8 @@ a.fusion-poweredby {
<img src="https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=master" class="travis-build-image">
</p>
<hr />
<p><strong>Note</strong>: The incoming 3.0 version has now been merged to the <code>master</code> branch on GitHub. For the source of the currently available PyPI version, please see the <code>2.4.4</code> tag.</p>
<hr />
<p>
<h1 style="position: absolute;
@ -249,12 +252,11 @@ a.fusion-poweredby {
<hr />
<p><img alt="Screenshot" src="img/quickstart.png" /></p>
<p><strong>Above</strong>: <em>Screenshot from the browsable API</em></p>
<hr />
<h2 id="requirements">Requirements</h2>
<p>REST framework requires the following:</p>
<ul>
<li>Python (2.6.5+, 2.7, 3.2, 3.3, 3.4)</li>
<li>Django (1.4.2+, 1.5, 1.6, 1.7)</li>
<li>Django (1.4.11+, 1.5.5+, 1.6, 1.7)</li>
</ul>
<p>The following packages are optional:</p>
<ul>
@ -357,7 +359,7 @@ urlpatterns = [
<li><a href="api-guide/renderers">Renderers</a></li>
<li><a href="api-guide/serializers">Serializers</a></li>
<li><a href="api-guide/fields">Serializer fields</a></li>
<li><a href="api-guide/relations">Serializer relations</a></li>
<li><a href="api-guide/relations">Serializer relations</a> <!--* <a href="api-guide/validators">Validators</a>--></li>
<li><a href="api-guide/authentication">Authentication</a></li>
<li><a href="api-guide/permissions">Permissions</a></li>
<li><a href="api-guide/throttling">Throttling</a></li>