django-rest-framework/rest_framework
Tom Christie 34eb18b498 Merge branch 'master' into filters
Conflicts:
	rest_framework/compat.py
	rest_framework/filters.py
2015-10-19 13:14:42 +01:00
..
authtoken removed south_migrations directory 2015-10-15 14:17:56 +06:00
locale Update the translations. 2015-09-21 08:07:56 +02:00
static/rest_framework Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
templates/rest_framework Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
templatetags Log in and log out require escape and mark_safe 2015-08-28 10:27:49 +01:00
utils Map TextField max_length to CharField 2015-10-16 07:17:33 -04:00
__init__.py Bump version to 3.2.4. 2015-09-20 22:04:25 +02:00
authentication.py Remove Django 1.4 compat code 2015-08-07 00:02:29 +02:00
compat.py Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
decorators.py Cleanup import following PEP 8 style guide 2015-06-25 16:10:17 -04:00
exceptions.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
fields.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
filters.py Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
generics.py Sort imports with isort 2015-06-25 16:55:51 -04:00
metadata.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
mixins.py Cleanup import following PEP 8 style guide 2015-06-25 16:10:17 -04:00
models.py Move models.resolve_model to serializers._resolve_model 2014-01-13 11:47:44 -05:00
negotiation.py More cleanup of browser overrides 2015-09-28 15:33:55 +01:00
pagination.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
parsers.py Sort imports with isort 2015-06-25 16:55:51 -04:00
permissions.py Remove Django 1.5 get_model_name fallback 2015-09-21 20:10:31 +02:00
relations.py Remove OrderedDict fallback 2015-09-22 16:35:38 +02:00
renderers.py Merge branch 'master' into filters 2015-10-19 13:14:42 +01:00
request.py Fix request cloning, so method becomes set 2015-09-17 16:34:03 +01:00
response.py Django 1.9's test case HttpResponse.json() is not cachable. 2015-08-28 11:55:23 +01:00
reverse.py More cleanup of browser overrides 2015-09-28 15:33:55 +01:00
routers.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
serializers.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
settings.py More cleanup of browser overrides 2015-09-28 15:33:55 +01:00
status.py Code linting and added runtests.py 2014-08-19 13:28:07 +01:00
test.py Bump minimum Django version to 1.5 2015-07-30 15:43:39 +01:00
throttling.py Cleanup import following PEP 8 style guide 2015-06-25 16:10:17 -04:00
urlpatterns.py Sort imports with isort 2015-06-25 16:55:51 -04:00
urls.py Sort imports with isort 2015-06-25 16:55:51 -04:00
validators.py Replaced all dict and set conversions from lists to dict and set literals. 2015-10-17 12:00:11 +03:00
versioning.py Sort imports with isort 2015-06-25 16:55:51 -04:00
views.py Remove Django 1.4 compat code 2015-08-07 00:02:29 +02:00
viewsets.py Fix 'metadata' action on viewsets. Closes #3158. Closes #3157. Closes #3115. 2015-07-16 10:08:22 +01:00