Commit Graph

335 Commits

Author SHA1 Message Date
mariodev
c4e7bdc77f pep8 2016-06-28 20:20:53 +02:00
mariodev
118b173282 Merge remote-tracking branch 'origin/master' 2016-06-28 20:14:26 +02:00
mariodev
8a004bb48a Increased test coverage
+ minor fixes
2016-06-28 20:14:05 +02:00
mariodev
2c4f7c2ec5 Merge pull request #202 from frewsxcv/patch-1
Update Travis CI config to run on Python 3.5.
2016-06-27 20:22:04 +02:00
Corey Farwell
8ffb292b70 Update Travis CI config to run on Python 3.5. 2016-06-06 20:37:21 -04:00
mariodev
3189a5c7a0 Merge pull request #187 from marsam/master
Capture OAuthError in TwitterLoginSerializer
2016-04-14 19:08:18 +02:00
mariodev
5e4d85bca9 Merge pull request #191 from EnTeQuAk/bugfix/fix-social-login-test
Fix social-adatper tests for allauth>=0.25.0
2016-04-14 17:15:16 +02:00
Girish
22667230bb passing on the context/request to serializer 2016-04-14 12:54:50 +01:00
Christopher Grebs
50087549e8 Fix social-adatper tests for allauth>=0.25.0
See 742d114abf for more details.

This unfortunately requires bumping up the version to 0.25.0
2016-03-14 13:20:24 +01:00
mariodev
49ccfe92a9 Merge pull request #190 from rpatterson/master
Documentation fixes
2016-03-11 10:31:50 +01:00
Ross Patterson
4463fb8afa Fix docs settings default value 2016-03-10 14:12:24 -08:00
Ross Patterson
adf22bcc78 Fix reference to missing extras_require 2016-03-09 11:51:52 -08:00
Maxim Kukhtenkov
e8cd780ae2 Remove unreachable code in LogoutView 2016-03-07 18:21:11 -05:00
mariodev
f95c42036b Merge pull request #188 from EnTeQuAk/patch-1
Fix typo in configuration.rst
2016-03-07 18:48:00 +01:00
Christopher Grebs
a661f02b8f Fix typo in configuration.rst 2016-03-07 18:43:18 +01:00
Mario Rodas
0737da0077 Capture OAuthError in TwitterLoginSerializer 2016-03-02 15:00:26 -05:00
Mario Rodas
86a487fe21 Import allauth.socialaccount only when declared in INSTALLED_APPS
Don't silently ignore ImportError
2016-03-02 14:37:27 -05:00
Maciej Jaworski
e3fc4e64e9 Merge pull request #178 from jasinai/UnignoreMoFiles
Unignore mo files
2016-03-01 12:00:57 +00:00
mjaworski
2572475971 fixed code quality 2016-03-01 11:51:01 +00:00
mariodev
eda3d7b6d2 Merge pull request #168 from Haos616/master
Fixed errors messages for PasswordResetSerializer
2016-02-29 21:56:16 +01: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
Nicola Hauke
340f0651c9 Adds the german mo file 2016-02-23 18:27:29 +01:00
Nicola Hauke
ff0664a66e Unignores translation files 2016-02-23 18:24:55 +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