| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2014-08-19 | Drop six from compat. 1.4.2 is now the lowest supported version. | Tom Christie | |
| 2014-08-19 | Merge master | Tom Christie | |
| 2014-07-28 | Fix #1712 (issue when django-guardian is installed but not configured/used) | Xavier Ordoquy | |
| 2014-06-23 | Merge remote-tracking branch 'origin/master' into 2.4.0 | Xavier 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-08 | Fixed #1624 (thanks @abraithwaite) | Xavier Ordoquy | |
| 2014-04-13 | Merge remote-tracking branch 'origin/master' into 2.4.0 | Xavier 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-06 | it's safe to import scope and constants | Eric Buehl | |
| 2014-03-05 | don't implicitly import provider.oauth2 | Eric Buehl | |
| 2014-02-18 | Merge remote-tracking branch 'reference/master' into feature/django_1_7 | Xavier Ordoquy | |
| 2014-02-18 | Moved the python_2_unicode_compatible into compat module. | Xavier Ordoquy | |
| 2014-01-28 | Import force_bytes on django >= 1.5 | Ian Foote | |
| 2013-12-23 | Merge branch 'bennbollay-patch-1' into 2.4.0 | Tom Christie | |
| Conflicts: .travis.yml docs/api-guide/routers.md rest_framework/compat.py tox.ini | |||
| 2013-12-16 | Don't import compat.py from authtoken.models. Closes #1297 | Tom Christie | |
| 2013-12-13 | Compat fixes for django-oauth-plus versions 2.0-2.2.1 | Tom Christie | |
| 2013-12-13 | Merge branch 'master' into 2.4.0 | Tom Christie | |
| Conflicts: .travis.yml docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/compat.py | |||
| 2013-12-09 | Fix compat issues for #1231 | Tom Christie | |
| 2013-09-25 | Whitespace fix | Tom Christie | |
| 2013-09-25 | Drop 1.3 support | Tom Christie | |
| 2013-09-25 | Merge master | Tom Christie | |
| 2013-09-23 | Address pending deprecation of Model._meta.module_name in Django 1.6 | Markus Kaiserswerth | |
| 2013-09-06 | added guardian as optional requirement, stubbed out object-level permission ↵ | bwreilly | |
| class | |||
| 2013-08-21 | Tweak comment | Tom Christie | |
| 2013-08-21 | Updating 2.4.0 release notes | Tom Christie | |
| 2013-08-19 | Merge branch 'master' into 2.4.0 | Tom Christie | |
| 2013-06-28 | Added APIRequestFactory | Tom Christie | |
| 2013-06-28 | Fix compat datetime import when oauth2 provide does not support timezone ↵ | Tom Christie | |
| aware datetimes | |||
| 2013-06-27 | Remove deprecated code | Tom Christie | |
| 2013-06-26 | Use timezone aware datetimes with oauth2 provider, when supported. Closes #947. | Tom Christie | |
| 2013-06-26 | Use AUTH_USER_MODEL consistently between various Django versions. Closes #946 | Tom Christie | |
| 2013-06-21 | Add support for StreamingHttpResponse. Closes #939 | Tom Christie | |
| 2013-05-18 | Move function to compat. | Ryan Kaskel | |
| 2013-05-05 | Merge branch 'master' into 2.3 | Tom Christie | |
| 2013-04-30 | Catch ImproperlyConfigured exception in compat.py (fixes #803) | Danilo Bargen | |
| 2013-04-23 | Merge remove-django-generics | Tom Christie | |
| 2013-04-10 | Fix 1.3 compat issue. Closes #780 | Tom Christie | |
| 2013-04-09 | Minor cleaning up on View | Tom Christie | |
| 2013-03-29 | Merge pull request #767 from tomchristie/fix-oauth2-token-only | Tom Christie | |
| Fix OAuth 2 token only | |||
| 2013-03-28 | Added force_text to compat | glic3rinu | |
| 2013-03-28 | Remove oauth2-provider backends reference from compat.py | Pierre Dulac | |
| 2013-03-12 | Clean up TokenHasReadWriteScope slightly | Tom Christie | |
| 2013-03-10 | Add TokenHasReadWriteScope class for permissions based on scopes | Pierre Dulac | |
| 2013-03-07 | Merge OAuth2 work. | Tom Christie | |
| 2013-03-07 | Merge & clean OAuth support | Tom Christie | |
| 2013-03-06 | Fix import errors | Pierre Dulac | |
| 2013-03-01 | Improve the `django-oauth2-provider` import block | Pierre Dulac | |
| to avoid naming collision with `oauth2` used for OAuth 1 | |||
| 2013-03-01 | Add the OAuth2Authentication class | Pierre Dulac | |
| 2013-02-26 | Move oauth2 and django-oauth-plus imports to compat and fix some minor issues | swistakm | |
| - 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-22 | defusedxml for security fix. | Tom Christie | |
| As per: http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html | |||
| 2013-02-14 | Added a serializer TimeField | Andreas Pelme | |
| 2013-02-06 | Purge 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. | |||
