aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/compat.py
AgeCommit message (Collapse)Author
2014-08-19Drop six from compat. 1.4.2 is now the lowest supported version.Tom Christie
2014-08-19Merge masterTom Christie
2014-07-28Fix #1712 (issue when django-guardian is installed but not configured/used)Xavier Ordoquy
2014-06-23Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/viewsets.md rest_framework/serializers.py rest_framework/throttling.py tests/test_generics.py tests/test_serializers.py tox.ini
2014-06-08Fixed #1624 (thanks @abraithwaite)Xavier Ordoquy
2014-04-13Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini
2014-03-06it's safe to import scope and constantsEric Buehl
2014-03-05don't implicitly import provider.oauth2Eric Buehl
2014-02-18Merge remote-tracking branch 'reference/master' into feature/django_1_7Xavier Ordoquy
2014-02-18Moved the python_2_unicode_compatible into compat module.Xavier Ordoquy
2014-01-28Import force_bytes on django >= 1.5Ian Foote
2013-12-23Merge branch 'bennbollay-patch-1' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini
2013-12-16Don't import compat.py from authtoken.models. Closes #1297Tom Christie
2013-12-13Compat fixes for django-oauth-plus versions 2.0-2.2.1Tom Christie
2013-12-13Merge branch 'master' into 2.4.0Tom Christie
Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py
2013-12-09Fix compat issues for #1231Tom Christie
2013-09-25Whitespace fixTom Christie
2013-09-25Drop 1.3 supportTom Christie
2013-09-25Merge masterTom Christie
2013-09-23Address pending deprecation of Model._meta.module_name in Django 1.6Markus Kaiserswerth
2013-09-06added guardian as optional requirement, stubbed out object-level permission ↵bwreilly
class
2013-08-21Tweak commentTom Christie
2013-08-21Updating 2.4.0 release notesTom Christie
2013-08-19Merge branch 'master' into 2.4.0Tom Christie
2013-06-28Added APIRequestFactoryTom Christie
2013-06-28Fix compat datetime import when oauth2 provide does not support timezone ↵Tom Christie
aware datetimes
2013-06-27Remove deprecated codeTom Christie
2013-06-26Use timezone aware datetimes with oauth2 provider, when supported. Closes #947.Tom Christie
2013-06-26Use AUTH_USER_MODEL consistently between various Django versions. Closes #946Tom Christie
2013-06-21Add support for StreamingHttpResponse. Closes #939Tom Christie
2013-05-18Move function to compat.Ryan Kaskel
2013-05-05Merge branch 'master' into 2.3Tom Christie
2013-04-30Catch ImproperlyConfigured exception in compat.py (fixes #803)Danilo Bargen
2013-04-23Merge remove-django-genericsTom Christie
2013-04-10Fix 1.3 compat issue. Closes #780Tom Christie
2013-04-09Minor cleaning up on ViewTom Christie
2013-03-29Merge pull request #767 from tomchristie/fix-oauth2-token-onlyTom Christie
Fix OAuth 2 token only
2013-03-28Added force_text to compatglic3rinu
2013-03-28Remove oauth2-provider backends reference from compat.pyPierre Dulac
2013-03-12Clean up TokenHasReadWriteScope slightlyTom Christie
2013-03-10Add TokenHasReadWriteScope class for permissions based on scopesPierre Dulac
2013-03-07Merge OAuth2 work.Tom Christie
2013-03-07Merge & clean OAuth supportTom Christie
2013-03-06Fix import errorsPierre Dulac
2013-03-01Improve the `django-oauth2-provider` import blockPierre Dulac
to avoid naming collision with `oauth2` used for OAuth 1
2013-03-01Add the OAuth2Authentication classPierre Dulac
2013-02-26Move oauth2 and django-oauth-plus imports to compat and fix some minor issuesswistakm
- alias oauth2 as oauth - remove rouge print - remove docstring markups - OAuthAuthentication.authenticate() now returns (user, token) two-tuple on success - don't set request.user because it's already set
2013-02-22defusedxml for security fix.Tom Christie
As per: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
2013-02-14Added a serializer TimeFieldAndreas Pelme
2013-02-06Purge naked excepts.Marc Tamlyn
Most of these had obvious exceptions which would be thrown. Some I'm not sure about but they should at least catch only Exception so as not to ignore SystemExit and other inappropriate Error classes.