django-rest-framework/rest_framework
Tom Christie 9c41c007af Merge branch 'master' into 2.4.0
Conflicts:
	.travis.yml
	docs/api-guide/routers.md
	docs/topics/release-notes.md
	rest_framework/compat.py
2013-12-13 16:32:34 +00:00
..
authtoken Use absolute import style 2013-07-09 13:12:28 +01:00
runtests Drop 1.3 support 2013-09-25 10:30:04 +01:00
static/rest_framework Browsable API tab preferences should be site-wide 2013-08-30 09:20:12 +01:00
templates/rest_framework Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
templatetags Drop 1.3 support 2013-09-25 10:30:04 +01:00
tests Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
utils Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
__init__.py Version 2.3.10 2013-12-06 22:13:50 +00:00
authentication.py Drop 1.3 support 2013-09-25 10:30:04 +01:00
compat.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
decorators.py Commenting link/action decorators as pending deprecation 2013-08-19 21:02:22 +01:00
exceptions.py Remove ConfigurationError in favor of Django's ImproperlyConfigured 2013-06-05 13:45:28 +01:00
fields.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
filters.py Add queryset aggregates to allowed fields in OrderingFilter 2013-11-12 23:40:07 +00:00
generics.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
mixins.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
models.py Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +01:00
negotiation.py Added proper charset support 2013-05-18 17:21:43 +01:00
pagination.py Cleanup docstrings 2013-04-25 12:47:34 +01:00
parsers.py Fixed exception handling with YAML and XML parsers. 2013-10-31 15:03:50 -07:00
permissions.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
relations.py Merge master 2013-09-25 09:44:26 +01:00
renderers.py Catch and mask ParseErrors that occur during rendering of the BrowsableAPI. 2013-12-09 07:34:08 +00:00
request.py Catch and mask ParseErrors that occur during rendering of the BrowsableAPI. 2013-12-09 07:34:08 +00:00
response.py Remove Content-Type header from empty responses. Fixes #1196 2013-12-03 16:55:11 +00:00
reverse.py Cleanup imports 2013-02-04 20:55:35 +00:00
routers.py Drop 1.3 support 2013-09-25 10:30:04 +01:00
serializers.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
settings.py Add get_ident method to pass new tests. 2013-12-06 14:21:52 -08:00
status.py Version 2.3.10 2013-12-06 22:13:50 +00:00
test.py force_authenticate(None) also clears session info. 2013-08-23 11:21:52 +01:00
throttling.py Allow NUM_PROXIES=0 and include more docs 2013-12-13 00:02:18 +00:00
urlpatterns.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
urls.py Drop 1.3 support 2013-09-25 10:30:04 +01:00
views.py Update comment in get_parser_context. 2013-10-24 13:45:16 +01:00
viewsets.py minor typo 2013-10-29 15:10:06 -05:00