3616 Commits

Author	SHA1	Message	Date
Tom Christie	ffe2c6d558	Add missing comma	2012-09-26 13:09:20 +01:00
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
Tom Christie	09a445b257	Bits of cleanup	2012-09-26 12:40:11 +01:00
Tom Christie	728e92f06a	Add request.QUERY_PARAMS	2012-09-26 12:39:39 +01:00
Tom Christie	758bcf5b1e	Tweak browseable API	2012-09-25 13:35:41 +01:00
Tom Christie	b7b7ca5af9	Don't display readonly fields	2012-09-25 13:35:28 +01:00
Tom Christie	e0913e29b8	Fix some bits of serialization	2012-09-25 13:20:12 +01:00
Tom Christie	064e1ba91f	Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing	2012-09-21 13:16:08 +01:00
Tom Christie	3f7371c796	Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing	2012-09-21 13:15:31 +01:00
Tom Christie	b4cd699b75	Tweak media_type -> accepted_media_type. Need to document, but marginally less confusing	2012-09-21 13:12:10 +01:00
Tom Christie	d9cba6398e	Clean up bits of templates etc	2012-09-20 17:44:34 +01:00
Tom Christie	f4670c8996	Hack out bunch of unneccesary private methods on View class	2012-09-20 14:00:53 +01:00
Tom Christie	5a82aa9726	Clean up template tags	2012-09-20 13:42:46 +01:00
Tom Christie	7efc6e8205	Remove dumbass __all__ variables	2012-09-20 13:22:07 +01:00
Tom Christie	87dae4d854	Remove old 'djangorestframework directories	2012-09-20 13:19:43 +01:00
Tom Christie	4b691c4027	Change package name: djangorestframework -> rest_framework	2012-09-20 13:06:27 +01:00