django-rest-framework/docs/api-guide
Xavier Ordoquy d08536ad9d Merge remote-tracking branch 'origin/master' into 2.4.0
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
2014-04-13 00:05:57 +02:00
..
authentication.md Adds HawkREST to 3rd party auth docs 2014-02-28 16:52:47 -06:00
content-negotiation.md Include import paths throughout docs. 2013-08-21 19:46:09 +01:00
exceptions.md Replace 'detail' with 'default_detail' in Exceptions guide and APIException class docstring. 2014-02-10 12:54:56 -06:00
fields.md Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
filtering.md Fix python syntax in filtering docs 2014-04-08 22:56:07 -04:00
format-suffixes.md Fix md formatting and typos 2013-05-28 17:13:12 +02:00
generic-views.md Fixed a bug backticks 2014-02-04 23:41:13 +08:00
pagination.md Link to DRF-extensions. Refs #1430 2014-02-20 14:54:17 +00:00
parsers.md Docs tweaks 2013-12-21 17:18:25 +00:00
permissions.md Tweak REST condition text. 2013-12-10 08:38:43 +00:00
relations.md Use www.django-rest-framework.org for docs instead of django-rest-framework.org due to issues with naked domains 2014-01-08 15:22:41 +00:00
renderers.md Docs tweaks 2013-12-21 17:18:25 +00:00
requests.md Note 'request.session' as available on requests. 2013-08-27 12:37:55 +01:00
responses.md Fixed typos in a bunch of docs 2013-08-07 14:00:06 -04:00
reverse.md Include import paths throughout docs. 2013-08-21 19:46:09 +01:00
routers.md Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
serializers.md Minor docs example fix 2014-02-21 14:23:33 +00:00
settings.md Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
status-codes.md Version 2.3.10 2013-12-06 22:13:50 +00:00
testing.md Minor typos fixed in api-guide/testing.md (request -> response). 2014-02-14 10:44:02 +01:00
throttling.md Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00
views.md fix broken documentation links 2013-12-04 16:10:05 -08:00
viewsets.md Merge remote-tracking branch 'origin/master' into 2.4.0 2014-04-13 00:05:57 +02:00