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
mariodev
4018d6a52a
Merge pull request #147 from jgr3go/jwt-support
...
JWT support
2016-02-29 16:59:23 +01:00
Jon Gregorowicz
9baeb2883b
Docs comment
2016-02-29 08:02:50 -05: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
b4c122ee5d
Bump
2016-02-29 07:47:47 -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
mariodev
b22a55b0fa
Merge pull request #183 from be-ndee/patch-1
...
typo fix
2016-02-29 12:59:00 +01: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
mariodev
837d9a6e46
Merge pull request #182 from jasinai/patch-1
...
Change the variable name in the doc
2016-02-26 13:30:36 +01:00
Nicola
42b860b8bf
Change the variable name in the doc
2016-02-25 21:37:08 +01:00
Maciej Jaworski
0850fb47ae
Update requirements.pip
2016-02-23 15:46:34 +00:00
Maciej Jaworski
ed42925053
Update setup.py
2016-02-23 15:39:26 +00:00
Maciej Jaworski
f01ed78d59
Update changelog.rst
2016-02-23 15:30:53 +00: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
bb7b1270b7
Adjusted phrasing and layout of social integration examples
2016-02-23 12:16:24 +00:00
Maciej Jaworski
b6e991e787
Merge pull request #154 from tevinjoseph/master
...
Added a Serializer for Twitter oauth
2016-02-23 12:04:38 +00:00
Tevin Joseph K O
ee9e848694
URL for twitter login added.
2016-02-23 17:31:11 +05:30
Tevin Joseph K O
8f05f20051
Updated api_endpoints.rst with twitter login
2016-02-23 17:18:30 +05:30
Tevin Joseph K O
e6c5be4b69
Updated index.rst with twitter login
2016-02-23 17:15:57 +05:30
Maciej Jaworski
b34ef24dd7
Merge pull request #167 from fergyfresh/master
...
Adds logout to API endpoints demo project
2016-02-23 11:07:26 +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
282ac5b517
Merge pull request #175 from Tivix/Update-test-requirements,-added-Django-1.9
...
Update test requirements, added django 1.9, pepfix
2016-02-23 10:38:59 +00:00
Maciej Jaworski
3bcabe6b17
Update serializers.py
...
pepfix
2016-02-23 10:35:41 +00:00
Maciej Jaworski
23221dc4d5
Update .travis.yml
2016-02-23 10:30:25 +00:00
Maciej Jaworski
c282a1309e
Merge pull request #171 from Akay7/CanLoginWithCustomUserModel
...
update for accept login users of CustomUserModel objects where doesn'…
2016-02-23 10:24:36 +00:00
Maciej Jaworski
40ac97b847
Update index.rst
2016-02-23 10:20:52 +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
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
Tabatha Memmott
77731475d2
Merge branch 'master' into developDemo
2016-01-07 17:42:23 -08:00
