Jamie Matthews 01770c53cd Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators ... * 'restframework2' of git://github.com/tomchristie/django-rest-framework: (56 commits) Bits of cleanup Add request.QUERY_PARAMS Add readonly 'id' field Tweak browseable API Don't display readonly fields Fix some bits of serialization Add csrf note Fix incorrect bit of tutorial Added tox.ini Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing Clean up bits of templates etc Hack out bunch of unneccesary private methods on View class Clean up template tags Remove dumbass __all__ variables Remove old 'djangorestframework directories Change package name: djangorestframework -> rest_framework Dont strip final '/' Use get_script_prefix to play nicely if not installed at the root. ... Conflicts: rest_framework/decorators.py		2012-09-26 13:05:21 +01:00
..
authtoken	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
runtests	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
static/rest_framework	Tweak browseable API	2012-09-25 13:35:41 +01:00
templates/rest_framework	Tweak browseable API	2012-09-25 13:35:41 +01:00
templatetags	Fix some bits of serialization	2012-09-25 13:20:12 +01:00
tests	Clean up bits of templates etc	2012-09-20 17:44:34 +01:00
utils	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
__init__.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
authentication.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
compat.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
decorators.py	Merge branch 'restframework2' of git://github.com/tomchristie/django-rest-framework into improved-view-decorators	2012-09-26 13:05:21 +01:00
exceptions.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
fields.py	Fix some bits of serialization	2012-09-25 13:20:12 +01:00
generics.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
mixins.py	Hack out bunch of unneccesary private methods on View class	2012-09-20 14:00:53 +01:00
models.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
negotiation.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
parsers.py	Bits of cleanup	2012-09-26 12:40:11 +01:00
permissions.py	Remove dumbass __all__ variables	2012-09-20 13:22:07 +01:00
renderers.py	Don't display readonly fields	2012-09-25 13:35:28 +01:00
request.py	Add request.QUERY_PARAMS	2012-09-26 12:39:39 +01:00
resources.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
response.py	Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing	2012-09-21 13:16:08 +01:00
reverse.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
serializers.py	Fix some bits of serialization	2012-09-25 13:20:12 +01:00
settings.py	Bits of cleanup	2012-09-26 12:40:11 +01:00
status.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
throttling.py	Clean up bits of templates etc	2012-09-20 17:44:34 +01:00
urlpatterns.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
urls.py	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00
views.py	Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing	2012-09-21 13:12:10 +01:00