<feed xmlns='http://www.w3.org/2005/Atom'>
<title>django-rest-framework/rest_framework/templates, branch 2.4.2</title>
<subtitle>Web APIs for Django.</subtitle>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/'/>
<entry>
<title>Restore body block to base template.</title>
<updated>2014-08-30T12:28:12+00:00</updated>
<author>
<name>Daniel Roseman</name>
</author>
<published>2014-08-30T12:28:12+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=b554c67d14fb0464106a247e5da96af80b819be9'/>
<id>b554c67d14fb0464106a247e5da96af80b819be9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Validation errors in the rendered HTML fixed</title>
<updated>2014-08-28T08:39:01+00:00</updated>
<author>
<name>Cezar Pendarovski</name>
</author>
<published>2014-08-28T08:39:01+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=53808892752f7bc0ff4735a8160e9975baf2a56c'/>
<id>53808892752f7bc0ff4735a8160e9975baf2a56c</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Put all TextNodes (method names) back to same line with parent element</title>
<updated>2014-08-27T07:41:33+00:00</updated>
<author>
<name>Cezar Pendarovski</name>
</author>
<published>2014-08-27T07:41:33+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=e5d88a80a97e6575c8b2a2ac40cffca6abdf1227'/>
<id>e5d88a80a97e6575c8b2a2ac40cffca6abdf1227</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'upstream/master' into fix-1719</title>
<updated>2014-08-25T15:28:22+00:00</updated>
<author>
<name>Cezar Pendarovski</name>
</author>
<published>2014-08-25T15:28:22+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=f6cbd88618553c394b5c62761ec1506e903de267'/>
<id>f6cbd88618553c394b5c62761ec1506e903de267</id>
<content type='text'>
Conflicts:
	rest_framework/templates/rest_framework/base.html
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	rest_framework/templates/rest_framework/base.html
</pre>
</div>
</content>
</entry>
<entry>
<title>Fixed the issue with the non-draggable horizontal scrollbar</title>
<updated>2014-08-22T07:53:03+00:00</updated>
<author>
<name>Cezar Pendarovski</name>
</author>
<published>2014-08-22T07:53:03+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=1e2bd1294e6a9ec877f624922b49368a18c228d0'/>
<id>1e2bd1294e6a9ec877f624922b49368a18c228d0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge master</title>
<updated>2014-08-19T09:11:10+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-08-19T09:11:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=e385a7b8eb6e538698f28128e43fe8bfaefd4e97'/>
<id>e385a7b8eb6e538698f28128e43fe8bfaefd4e97</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge pull request #1641 from javins/login-title</title>
<updated>2014-08-18T19:28:34+00:00</updated>
<author>
<name>Tom Christie</name>
</author>
<published>2014-08-18T19:28:34+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=c092b4df7873b1bf9ead5ac65406f1347d4c4365'/>
<id>c092b4df7873b1bf9ead5ac65406f1347d4c4365</id>
<content type='text'>
Refactor login template to extend base.</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Refactor login template to extend base.</pre>
</div>
</content>
</entry>
<entry>
<title>Remove duplicate class attributes</title>
<updated>2014-08-05T14:25:48+00:00</updated>
<author>
<name>Jason Alan Palmer</name>
</author>
<published>2014-08-05T14:25:48+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=2d6469348de71f04507f00a5e0e608ae49829dd1'/>
<id>2d6469348de71f04507f00a5e0e608ae49829dd1</id>
<content type='text'>
These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
These duplicate attributes are ignored by at least Firefox and Chrome, so this change has no effect on the style</pre>
</div>
</content>
</entry>
<entry>
<title>Refactor login template to extend base.</title>
<updated>2014-06-14T05:26:00+00:00</updated>
<author>
<name>Walt Javins</name>
</author>
<published>2014-06-14T05:26:00+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=b4c7717cb80cb13a2f13aae8855e226685306880'/>
<id>b4c7717cb80cb13a2f13aae8855e226685306880</id>
<content type='text'>
While experimenting with extending DRF, I found that the login page
1) had no title, and 2) duplicated &lt;head&gt; info from base.html.

This change adds a new {% block body %} to the base.html template
which allows override of the entire html &lt;body&gt;. login_base.html
has its duplicated head info stripped, and now extends base.html
to share common html &lt;head&gt; templating.

As part of this change, pretify.css is unnecessarily added to
login_base.html.  If this is deemed a problem, it will be easy to
block that css out, and have login_base.html override the block.

Ideally, I would have liked to create a new api_base.html that extends
base.html, move the api specific logic into that template, and leave
base.html content agnostic, to truely be a unifying base for all DRF
pages.  But this change would break current apps that override
api.html and expect base.html to be the immediate super template. :/

This change is benificial because it:
 - removes duplication of header declarations (mostly css includes)
 - adds a html title to the login page
 - standardizes html header info across all DRF pages

Docs are updated to reflect the new structure.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
While experimenting with extending DRF, I found that the login page
1) had no title, and 2) duplicated &lt;head&gt; info from base.html.

This change adds a new {% block body %} to the base.html template
which allows override of the entire html &lt;body&gt;. login_base.html
has its duplicated head info stripped, and now extends base.html
to share common html &lt;head&gt; templating.

As part of this change, pretify.css is unnecessarily added to
login_base.html.  If this is deemed a problem, it will be easy to
block that css out, and have login_base.html override the block.

Ideally, I would have liked to create a new api_base.html that extends
base.html, move the api specific logic into that template, and leave
base.html content agnostic, to truely be a unifying base for all DRF
pages.  But this change would break current apps that override
api.html and expect base.html to be the immediate super template. :/

This change is benificial because it:
 - removes duplication of header declarations (mostly css includes)
 - adds a html title to the login page
 - standardizes html header info across all DRF pages

Docs are updated to reflect the new structure.
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/master' into 2.4.0</title>
<updated>2014-04-12T22:05:57+00:00</updated>
<author>
<name>Xavier Ordoquy</name>
</author>
<published>2014-04-12T22:05:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.teddywing.com/fork/django-rest-framework/commit/?id=d08536ad9d026fb7126c430f6d9c18f8540aacd6'/>
<id>d08536ad9d026fb7126c430f6d9c18f8540aacd6</id>
<content type='text'>
Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	.travis.yml
	docs/api-guide/fields.md
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/authentication.py
	rest_framework/serializers.py
	rest_framework/templatetags/rest_framework.py
	rest_framework/tests/test_authentication.py
	rest_framework/tests/test_filters.py
	rest_framework/tests/test_hyperlinkedserializers.py
	rest_framework/tests/test_serializer.py
	rest_framework/tests/test_testing.py
	rest_framework/utils/encoders.py
	tox.ini
</pre>
</div>
</content>
</entry>
</feed>
