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
mariodev
ef56efc0c8
Merge pull request #152 from caruccio/logout-on-get
...
Allow logout on GET
2016-02-26 13:38:01 +01:00
Maciej Jaworski
b6dfd69009
Merge pull request #177 from tevinjoseph/master
...
fixed pep8 error in social_serializers
2016-02-23 13:27:01 +00:00
Tevin Joseph K O
b2edfffc91
fixed pep8 error in social_serializers
...
fixed pep8 error in social_serializers which cause documentation build error
2016-02-23 17:52:44 +05:30
Maciej Jaworski
b6e991e787
Merge pull request #154 from tevinjoseph/master
...
Added a Serializer for Twitter oauth
2016-02-23 12:04:38 +00: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
Poderyagin Egor
cc9552adda
update for accept login users of CustomUserModel objects where doesn't exist username field and setted USERNAME_FIELD property
2016-02-17 08:35:47 +03:00
Jon Gregorowicz
511329c30a
Fixing merge tool induced file endings
2016-02-16 00:49:41 -05:00
Jon Gregorowicz
8b5e5173d0
Added newline to pip file
2016-02-16 00:43:19 -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
mariodev
00415301d6
Merge pull request #145 from mdentremont/topic/131
...
#131 : Do not raise 400 when resetting password for non-existing account
2016-01-14 23:53:31 +01:00
mario
7e85667208
Made e-mail options more extendible for PasswordResetSerializer
2016-01-14 23:42:02 +01:00
Tevin Joseph K O
1af16ae7ba
Added a Serializer for Twitter oauth
...
Added a serializer for twitter OAuth to work. If you are not using this it will cause an error ('TwitterOAuthAdapter' object has no attribute 'parse_token'). It happens because method parse_token() is implemented in OAuth2Adapter, but Twitter uses OAuth 1.0, so TwitterOAuthAdapter inherits from OAuthAdapter, which doesn't have parse_token() method. Example usage is given below:
class TwitterLogin(LoginView):
serializer_class = TwitterLoginSerializer
adapter_class = TwitterOAuthAdapter
2016-01-13 12:43:12 +05:30
mario
ae8a26b708
Return token only when verification is mandatory
2016-01-11 22:33:14 +01:00
Mateus Caruccio
70a4dc9a13
Allow logout on GET
2016-01-09 01:11:35 -02: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
mariodev
d63232224e
Merge pull request #150 from Tivix/pr/141
...
Ability to login using e-mail (without allauth)
2016-01-06 18:16:51 +01:00
mario
54eb54ad65
Cleaned up LoginSerializer codebase
2016-01-06 01:18:13 +01:00
mario
b12ed79bb1
Merge branch 'master' into pr/141
2016-01-05 22:32:38 +01:00
Tabatha Memmott
55fb36ec91
url change for tests
2016-01-05 11:46:01 -08:00
Tabatha Memmott
0677109c1b
so tests will pass -- url syntax change
2016-01-05 11:38:37 -08:00
Tabatha Memmott
29669be296
Merge branch 'master' into developDemo
2016-01-05 08:08:17 -08:00
mario
073dd3e765
Fixed flake8 warnings
2016-01-05 15:09:31 +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
Matt d'Entremont
d36a9bc1cb
#131 : Do not raise 400 when resetting password for non-existing account
...
- Do not raises validation error if email doesn't exist
- Update unit test
2016-01-04 10:17:47 -04:00
Mateus Caruccio
c9d55f768c
Add support for custom Token model
2016-01-02 15:59:06 -02:00
mario
ec91620550
Merge branch 'master' into pr/130
2016-01-02 17:32:40 +01:00
mariodev
4a56a9e7e5
Merge pull request #140 from Akay7/TestResetPass
...
Test reset pass
2015-12-22 11:57:01 +01:00
mario
4c8db510b0
Fixed test exception.
2015-12-22 09:28:35 +01:00
ron8mcr
f848c8b6fa
Merge remote-tracking branch 'Tivix/django-rest-auth/master'
2015-12-15 17:06:47 +07:00
Poderyagin Egor
bb2fb65f7d
Auth by email
2015-12-13 23:43:33 +03:00
Poderyagin Egor
a93b7f5cec
Added test case for reset by email in different case
2015-12-13 22:24:27 +03:00
Poderyagin Egor
9b7ede752b
Make email in password reset serializer Case unsensetive
2015-12-10 18:13:28 +06:00
mario
72062408aa
Reorganized test files
2015-12-04 09:32:03 +01:00
anyone_j
cc963ca1a1
fix import complete_social_login
2015-11-26 14:38:25 +05:00
