Commit Graph

732 Commits

Author SHA1 Message Date
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
Haos616
dae38d4e10 Fixed errors messages for PasswordResetSerializer
Fixed errors messages for PasswordResetSerializer
2016-02-10 18:45:32 +02:00
Billy Ferguson
37c49e0c86 Adds token to logout API documentation 2016-02-08 17:35:37 -05:00
Billy Ferguson
8d91e1881e Added logout functionality to demo project 2016-02-08 17:14:25 -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
mariodev
811dc30830 Merge pull request #156 from Tivix/pr/155
Made e-mail options more extendible for `PasswordResetSerializer`
2016-01-14 23:43:28 +01:00
mario
7e85667208 Made e-mail options more extendible for PasswordResetSerializer 2016-01-14 23:42:02 +01:00
mario
af9dcbd79b Added FAQ issue. 2016-01-14 22:36:58 +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
mariodev
97dbb528a2 Merge pull request #153 from Tivix/pr/128
Return token only when verification is mandatory
2016-01-11 22:47:50 +01:00
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
mariodev
f9547f62e8 Merge pull request #144 from caruccio/custom-token
Add support for custom Token model
2016-01-08 08:43:18 +01:00
Mateus Caruccio
c087899311 Merge branch 'master' into custom-token 2016-01-07 19:56:57 -02:00
Mateus Caruccio
ccc261d57f Merge branch 'master' of https://github.com/Tivix/django-rest-auth 2016-01-07 19:56:33 -02: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
37dda5d7be Merge pull request #149 from Tivix/test_fail_url
url change for tests
2016-01-05 11:50:53 -08:00
Tabatha Memmott
55fb36ec91 url change for tests 2016-01-05 11:46:01 -08:00
Tabatha Memmott
2bddb944cc Merge pull request #148 from Tivix/developDemo
Develop demo
2016-01-05 09:45:17 -08:00
Tabatha Memmott
29669be296 Merge branch 'master' into developDemo 2016-01-05 08:08:17 -08:00
mariodev
ef17cb3165 Merge pull request #146 from mdentremont/topic/86
#86: Add missing dependencies to setup.py
2016-01-05 15:14:28 +01: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
317db1b811 Bump version 2016-01-04 13:57:38 -05: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
1d9c2d647e #86: Add missing dependencies to setup.py
- Add django-allauth as an extra, and update documentation
- Ensure django-allauth and responses are present when running tests
2016-01-04 10:29:50 -04: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
57e7fb998f Merge branch 'custom-token' of github.com:caruccio/django-rest-auth into custom-token 2016-01-02 16:00:55 -02: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
Mateus Caruccio
eb61b24087 Add support for custom Token model 2016-01-02 12:38:05 -02: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
mario
23eb6e5be5 Added coverage_html to .gitignore 2015-12-22 09:27:17 +01:00
mariodev
7bd7924801 Merge pull request #143 from Tivix/issue_116_fix_csrf_tokens_email_login
fix demo by add csrf and modify account settings
2015-12-22 08:46:01 +01:00
Will Liu
4d9e33e9a8 fix demo by add csrf and modify account settings
In response to Issue 116 at https://github.com/Tivix/django-rest-auth/issues/116
* Add csrf_token tags on demo templates (was returning CSRF page)
* Update settings file for the demo login (was returning message that email was required when template only shows username and password fields)
2015-12-21 16:32:53 -05:00
mariodev
991178a9d5 Merge pull request #142 from Tivix/update-demo-rst
Update demo.rst
2015-12-21 18:56:10 +01:00
Will
411cc298b3 Update demo.rst
With requirements file of django >= 1.7.0, change command of `syncdb` to `migrate` (`syncdb` is deprecated).
2015-12-21 11:01:41 -05: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