Tabatha Memmott
e01fdc643a
Merge branch 'master' into developDemo
...
Conflicts:
rest_auth/app_settings.py
rest_auth/serializers.py
rest_auth/views.py
resolved conflicts
2016-02-29 12:28:06 -08:00
Jon Gregorowicz
4ba9841bc5
Merge changes
2016-02-29 08:01:39 -05:00
Jon Gregorowicz
1eb4b45e50
Fixing tests
2016-02-29 07:57:54 -05:00
Jon Gregorowicz
85c2fe4661
Merge branch 'master' into jwt-support
2016-02-29 07:48:37 -05:00
Jon Gregorowicz
e3901516cb
Merge branch 'master' into jwt-support
...
# Conflicts:
# docs/changelog.rst
# rest_auth/registration/views.py
2016-02-29 07:45:43 -05:00
Andreas Bissinger
9a0cbc81eb
typo fix
2016-02-29 12:53:08 +01:00
Maciej Jaworski
aa839f97d2
Added missing import
2016-02-23 10:59:47 +00:00
Maciej Jaworski
1a0ab4488e
Merge pull request #165 from jasinai/AddTranslation
...
Adds ugettext_lazy to more texts
2016-02-23 10:55:42 +00:00
Maciej Jaworski
3bcabe6b17
Update serializers.py
...
pepfix
2016-02-23 10:35:41 +00:00
Jon Gregorowicz
511329c30a
Fixing merge tool induced file endings
2016-02-16 00:49:41 -05:00
Jon Gregorowicz
e3a1ba520e
Added tests for JWT, fixed merge issues
2016-02-16 00:42:18 -05:00
Jon Gregorowicz
f8a9cc152d
Merge branch 'master' into jwt-support
...
# Conflicts:
# docs/configuration.rst
# rest_auth/registration/views.py
# rest_auth/tests/test_api.py
# rest_auth/utils.py
# rest_auth/views.py
2016-02-15 23:35:32 -05:00
mariodev
7c8a34f700
Merge pull request #132 from asudoma/master
...
fix import complete_social_login
2016-02-08 08:12:52 +01:00
Nicola Hauke
152b0a6fb6
Adds ugettext_lazy to more texts
...
Also adds a first german translation.
2016-02-02 15:29:16 +01:00
mario
ae8a26b708
Return token only when verification is mandatory
2016-01-11 22:33:14 +01:00
Tabatha Memmott
77731475d2
Merge branch 'master' into developDemo
2016-01-07 17:42:23 -08:00
Mateus Caruccio
ccc261d57f
Merge branch 'master' of https://github.com/Tivix/django-rest-auth
2016-01-07 19:56:33 -02:00
Tabatha Memmott
1a08fd90dc
email work
2016-01-07 13:39:16 -08:00
mariodev
334a29c4d9
Merge pull request #151 from Tivix/pr/130
...
Refactored registration logic
2016-01-06 18:26:47 +01:00
mario
99c4dc9d05
Brought back pass verification + added test
2016-01-05 14:56:11 +01:00
Tabatha Memmott
0e3fb4a5c9
closes PR #134 and adds same syntax to demo
2016-01-04 16:29:47 -08:00
Jon Gregorowicz
19e234d1dc
* Added support for REST_USE_JWT
...
* Added JWTSerializer
* Added JWT encoding support, based on django-rest-framework-jwt
* Tests for JWT authentication
2016-01-04 12:45:33 -05:00
Mateus Caruccio
c9d55f768c
Add support for custom Token model
2016-01-02 15:59:06 -02:00
anyone_j
cc963ca1a1
fix import complete_social_login
2015-11-26 14:38:25 +05:00
ron8mcr
52f04ba224
Update tests and fix register serializer
2015-11-24 22:04:57 +07:00
ron8mcr
65b29d3515
None as success_url for complete_signup in RegisterView
2015-11-24 21:16:39 +07:00
ron8mcr
30fd6414ce
Explict Allow Any for register view
2015-11-24 21:07:20 +07:00
Roman Gorbil
10ae7acac9
Rewrite registration logic
2015-11-24 17:11:46 +07:00
Mateusz Sikora
3eaa491fb1
fix flake8
2015-11-06 14:09:47 +01:00
Mateusz Sikora
57a879f6c0
Merge branch 'master' of github.com:Tivix/django-rest-auth
2015-11-06 14:09:23 +01:00
Mateusz Sikora
60581fc375
fix issue with setting POST attribute in request
2015-11-06 14:07:12 +01:00
Karl Fleischmann
f1858e4ce4
Bypass AssertionErrors on nested Hyperlinked fields
...
Send request as context data to the UserDetailSerializer class, when
signing up. This way nested Hyperlinked serializer fields can be
correctly resolved.
2015-10-28 00:55:08 +01:00
mario
680f24e43d
Fix the optional deps for allauth.socialaccount
2015-10-04 12:41:07 +02:00
Nick Spacek
0ae97701c8
Adds check for optional deps in INSTALLED_APPS
...
Previously the serializers.py file relied solely on the presence of
allauth.socialaccount in the PYTHON_PATH to determine if its use was
required. This adds another check in the Django INSTALLED_APPS for the
allauth.socialaccount app, and then continues with the import if the app
has been added.
2015-10-01 09:51:25 -03:00
Philippe Luickx
4cf33ff9fa
SocialLoginSerializer allow_blank fix
2015-08-17 13:34:59 +03:00
Mateusz Sikora
388314f831
fix flake8
2015-08-14 13:49:47 +02:00
Philippe Luickx
64ab8be2f0
catching incorrect input
2015-08-13 10:56:25 +03:00
Philippe Luickx
5a6c8f549b
bugfix
2015-08-10 11:24:21 +03:00
Philippe Luickx
02bf6fbe5b
bugfix, request.DATA is deprecated, replaced with request.data
2015-08-07 14:31:33 +03:00
Philippe Luickx
ad94008503
appending all views with View
2015-08-07 13:54:45 +03:00
Philippe Luickx
4a3ea85f44
well, that was an easy cleanup, now it is nice and consistent
2015-08-07 13:46:18 +03:00
Philippe Luickx
74f2ffec7f
now also accepting authorization codes from social login (e.g. facebook)
2015-08-07 13:26:57 +03:00
Philippe Luickx
8ea935ef40
conditional import
2015-08-07 11:25:40 +03:00
Nikolay Golub
a9d2a24011
Make names more consistent
2015-07-23 22:33:48 +03:00
Nikolay Golub
f43a6b8d58
move SocialAccount population to the separate method in the SocialLoginSerializer.
...
It makes easier to get the correct signup for custom user models, because application can subclass SocialLoginSeriaLizer and add required fields to the instance.
2015-07-23 22:22:39 +03:00
mjaworski
a60df71c07
Flake8 style fixes
2015-04-28 10:22:08 +02:00
mjaworski
80a7988a9b
Django 1.8 compatibility fixes
2015-04-17 09:53:46 +02:00
Jeppe Vesterbæk
c615cd94aa
DRF 3 bug: get HttpRequest from DRF request object. Similar to issue #43
2015-02-25 16:52:51 +01:00
Lele Long
199a4989c5
Adjust for djangorestframework 3
2015-01-15 23:45:01 +08:00
Mateusz Sikora
01ffd4127b
support django-rest-framework v3.0
2015-01-09 12:05:14 +01:00
