Tom Christie
80ba047347
Compat fixes
2014-09-10 16:57:22 +01:00
Tom Christie
01c8c0cad9
Added help_text argument to fields
2014-09-10 13:52:16 +01:00
Tom Christie
63d02dbea8
Drop six from compat. 1.4.2 is now the lowest supported version.
2014-08-19 17:06:55 +01:00
Tom Christie
e385a7b8eb
Merge master
2014-08-19 10:11:10 +01:00
Xavier Ordoquy
fe048dc4fb
Fix #1712 (issue when django-guardian is installed but not configured/used)
2014-07-28 07:37:30 +02:00
Xavier Ordoquy
2489e38a06
Merge remote-tracking branch 'origin/master' into 2.4.0
...
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-23 14:02:45 +02:00
Xavier Ordoquy
e8ec81f5e9
Fixed #1624 (thanks @abraithwaite)
2014-06-08 09:03:21 +02:00
Xavier Ordoquy
d08536ad9d
Merge remote-tracking branch 'origin/master' into 2.4.0
...
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-04-13 00:05:57 +02:00
Eric Buehl
34887ed756
it's safe to import scope and constants
2014-03-06 20:21:44 +00:00
Eric Buehl
e0682e9298
don't implicitly import provider.oauth2
2014-03-05 17:15:52 +00:00
Xavier Ordoquy
b2f0f4fcf4
Merge remote-tracking branch 'reference/master' into feature/django_1_7
2014-02-18 11:42:35 +01:00
Xavier Ordoquy
5ae94547bc
Moved the python_2_unicode_compatible into compat module.
2014-02-18 11:42:17 +01:00
Ian Foote
74fec7eeb4
Import force_bytes on django >= 1.5
2014-01-28 14:30:46 +00:00
Tom Christie
52686420f4
Merge branch 'bennbollay-patch-1' into 2.4.0
...
Conflicts:
.travis.yml
docs/api-guide/routers.md
rest_framework/compat.py
tox.ini
2013-12-23 09:48:59 +00:00
Tom Christie
fc2dee844a
Don't import compat.py from authtoken.models. Closes #1297
2013-12-16 08:59:10 +00:00
Tom Christie
a87c55a93a
Compat fixes for django-oauth-plus versions 2.0-2.2.1
2013-12-13 21:57:07 +00:00
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
Tom Christie
ddd17c69e7
Fix compat issues for #1231
2013-12-09 09:24:10 +00:00
Tom Christie
1bd8fe4152
Whitespace fix
2013-09-25 10:36:08 +01:00
Tom Christie
e441f85109
Drop 1.3 support
2013-09-25 10:30:04 +01:00
Tom Christie
21cd638659
Merge master
2013-09-25 09:44:26 +01:00
Markus Kaiserswerth
abbe9213f9
Address pending deprecation of Model._meta.module_name in Django 1.6
2013-09-23 17:48:25 +02:00
bwreilly
4a9dcfa760
added guardian as optional requirement, stubbed out object-level permission class
2013-09-06 11:01:31 -05:00
Tom Christie
f631f55f8e
Tweak comment
2013-08-21 21:35:17 +01:00
Tom Christie
44ceef8415
Updating 2.4.0 release notes
2013-08-21 21:30:25 +01:00
Tom Christie
28e44efe25
Merge branch 'master' into 2.4.0
2013-08-19 20:58:28 +01:00
Tom Christie
7224b20d58
Added APIRequestFactory
2013-06-28 17:17:39 +01:00
Tom Christie
4ee9cdc7af
Fix compat datetime import when oauth2 provide does not support timezone aware datetimes
2013-06-28 09:35:52 +01:00
Tom Christie
3fcc01273c
Remove deprecated code
2013-06-27 20:29:52 +01:00
Tom Christie
69e5e3cc0d
Use timezone aware datetimes with oauth2 provider, when supported. Closes #947 .
2013-06-26 21:18:13 +01:00
Tom Christie
715bd47dfa
Use AUTH_USER_MODEL consistently between various Django versions. Closes #946
2013-06-26 17:56:42 +01:00
Tom Christie
8cc63b09f6
Add support for StreamingHttpResponse. Closes #939
2013-06-21 22:42:04 +01:00
Ryan Kaskel
579f77ceaa
Move function to compat.
2013-05-18 17:04:17 +01:00
Tom Christie
75b2afcb23
Merge branch 'master' into 2.3
2013-05-05 16:48:46 +01:00
Danilo Bargen
e5040fbf94
Catch ImproperlyConfigured exception in compat.py ( fixes #803 )
2013-04-30 23:24:33 +02:00
Tom Christie
835d3f89d3
Merge remove-django-generics
2013-04-23 11:59:13 +01:00
Tom Christie
3f91379e4e
Fix 1.3 compat issue. Closes #780
2013-04-10 09:24:24 +01:00
Tom Christie
c73d0e1e39
Minor cleaning up on View
2013-04-09 18:22:39 +01:00
Tom Christie
a69262a1cd
Merge pull request #767 from tomchristie/fix-oauth2-token-only
...
Fix OAuth 2 token only
2013-03-29 06:42:24 -07:00
glic3rinu
3774ba3ed2
Added force_text to compat
2013-03-28 12:01:08 +01:00
Pierre Dulac
fa61b2b2f1
Remove oauth2-provider backends reference from compat.py
2013-03-28 01:05:51 +01:00
Tom Christie
f513db714d
Clean up TokenHasReadWriteScope slightly
2013-03-12 19:07:30 +00:00
Pierre Dulac
e03906a5c4
Add TokenHasReadWriteScope class for permissions based on scopes
2013-03-10 14:08:29 +01:00
Tom Christie
a4b33992a5
Merge OAuth2 work.
2013-03-07 17:43:13 +00:00
Tom Christie
d4e3610e71
Merge & clean OAuth support
2013-03-07 09:01:53 +00:00
Pierre Dulac
8845c0be88
Fix import errors
2013-03-06 22:42:09 +01:00
Pierre Dulac
9d5c306038
Improve the django-oauth2-provider import block
...
to avoid naming collision with `oauth2` used for OAuth 1
2013-03-01 11:53:30 +01:00
Pierre Dulac
da9d7fb8ec
Add the OAuth2Authentication class
2013-03-01 02:08:58 +01:00
swistakm
59a6f5f463
Move oauth2 and django-oauth-plus imports to compat and fix some minor issues
...
- 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-26 11:22:21 +01:00
Tom Christie
dcee027fa9
defusedxml for security fix.
...
As per:
http://blog.python.org/2013/02/announcing-defusedxml-fixes-for-xml.html
2013-02-22 13:17:22 +00:00
