django-rest-framework/rest_framework
José Padilla b844cc4bb6 Merge remote-tracking branch 'upstream/version-3.1' into version-3.1
Conflicts:
	rest_framework/serializers.py
2015-02-01 15:34:33 -04:00
..
authtoken Merge master 2015-01-30 14:00:25 +00:00
locale Add built-in translations. 2015-01-30 16:41:21 +00:00
static/rest_framework Add paging controls 2015-01-22 17:25:12 +00:00
templates/rest_framework Add paging controls 2015-01-22 17:25:12 +00:00
templatetags Fix compat issues 2015-01-16 20:30:46 +00:00
utils Merge master 2015-01-30 14:00:25 +00:00
__init__.py Bumped the version. 2015-01-27 19:45:37 +01:00
authentication.py prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings 2015-01-07 12:46:23 +00:00
compat.py Merge master 2015-01-30 14:00:25 +00:00
decorators.py @api_view defaults to allowing GET 2014-11-28 15:55:02 +00:00
exceptions.py swap backticks for double quotes 2015-01-07 18:22:30 +00:00
fields.py Merge master 2015-01-30 14:00:25 +00:00
filters.py Cursor pagination now works with OrderingFilter 2015-01-22 16:12:05 +00:00
generics.py More pagination tests & cleanup 2015-01-16 16:55:46 +00:00
metadata.py Removed custom StringIO, force_text, smart_text compat 2014-12-04 03:11:42 +01:00
mixins.py First pass at 3.1 pagination API 2015-01-09 15:30:36 +00:00
models.py Change package name: djangorestframework -> rest_framework 2012-09-20 13:06:27 +01:00
negotiation.py request.data attribute 2014-09-26 10:46:52 +01:00
pagination.py Add paging controls 2015-01-22 17:25:12 +00:00
parsers.py Merge master 2015-01-30 14:00:25 +00:00
permissions.py Merge master 2014-12-12 15:37:43 +00:00
relations.py Merge master 2015-01-30 14:00:25 +00:00
renderers.py Merge master 2015-01-23 14:28:59 +00:00
request.py Clone the versioning_scheme when necessary. Fixes #2477 2015-01-27 17:10:17 -08:00
response.py More sensible response caching. 2015-01-23 12:56:55 +00:00
reverse.py Versioning first pass 2014-12-16 15:34:19 +00:00
routers.py Removed router check for deprecated '.model' attribute 2015-01-29 17:28:03 +01:00
serializers.py Add support for Django 1.8’s ArrayField 2015-02-01 15:33:34 -04:00
settings.py Merge master 2015-01-30 14:00:25 +00:00
status.py Code linting and added runtests.py 2014-08-19 13:28:07 +01:00
test.py Client.logout() also clears any force_authenticate 2014-12-12 13:13:08 +00:00
throttling.py Fix error when NUM_PROXIES is greater than one 2015-01-12 08:12:24 -04:00
urlpatterns.py Merge branch 'master' into 2.4.0 2013-12-13 16:32:34 +00:00
urls.py Regression for #1810: Test login view renders 2014-09-01 10:07:05 +02:00
validators.py prefer single quotes in source and double quotes in user visible strings; add some missing full stops to user visible strings 2015-01-07 12:46:23 +00:00
versioning.py NotImplemented -> NotImplementedError 2015-01-19 15:22:38 +00:00
views.py Fix error text in test. 2015-01-31 08:53:40 +00:00
viewsets.py Removed unused imports, pep8 fixes, typo fixes 2014-12-05 00:29:28 +01:00