Commit Graph

509 Commits

Author SHA1 Message Date
Maciej Jaworski
c1f2bb48dd Merge pull request #81 from itbabu/master
Fix TabError: inconsistent use of tabs and spaces in indentation
2015-04-28 08:19:39 +02:00
Marco Badan
4b9b631744 Fix TabError: inconsistent use of tabs and spaces in indentation 2015-04-27 17:06:48 +02:00
Maciej Jaworski
24af3512de Merge pull request #76 from Antwan86/master
Removes a warning due to the usage of django.utils.importlib which is deprecated. Includes backward compatibility for Django 1.5 & 1.6 + Python 2.6.
2015-04-27 14:12:41 +02:00
Antoine
7aa2fdb18c Fixed version check 2015-04-27 20:05:25 +08:00
Antoine
f31827d642 Merge branch 'master' of github.com:Tivix/django-rest-auth 2015-04-27 19:59:40 +08:00
mjaworski
ea782b83e2 fixed url conf in example 2015-04-27 11:01:19 +02:00
Antoine
ee55380a6c Switched to standard import_module as the Django embedded one is deprecated and will be removed in next version 2015-04-17 16:49:32 +01:00
Mateusz Sikora
92ca2e33d6 Merge pull request #75 from Tivix/django-1.8
Django 1.8 compatibility fixes

...lecisz malina 
2015-04-17 10:03:05 +02:00
mjaworski
80a7988a9b Django 1.8 compatibility fixes 2015-04-17 09:53:46 +02:00
Mateusz Sikora
6eb0146c2b Revert "Update .travis.yml"
This reverts commit 4e2cb5beaf.
2015-04-13 15:58:40 +02:00
Mateusz Sikora
4e2cb5beaf Update .travis.yml 2015-04-13 15:23:55 +02:00
mjaworski
e6d56c9e02 Merge branch 'master' of https://github.com/Tivix/django-rest-auth 2015-04-13 15:19:57 +02:00
mjaworski
bef1074052 Replaced references to contrib.auth.model.User with get_user_model(). Closes #68 2015-04-13 15:19:54 +02:00
Mateusz Sikora
d4d390e74d Merge pull request #56 from safaktrgt/master
change PasswordResetConfirmSerializer setpasswordform exception from token invalid  value error to form validation error
2015-04-13 15:11:42 +02:00
mjaworski
d0c5f0a6d9 Merge branch 'master' of https://github.com/Tivix/django-rest-auth 2015-04-13 15:05:26 +02:00
Mateusz Sikora
32ebd551b3 Update .travis.yml 2015-04-13 15:05:10 +02:00
mjaworski
8d4a227509 Added simple redirect to fix #66 2015-04-13 15:04:14 +02:00
mjaworski
0a98594a11 Updated gitignore 2015-04-13 15:03:46 +02:00
Mateusz Sikora
dddde2d618 Merge pull request #65 from rdragos/patch-1
Update installation.rst
2015-04-03 10:37:13 +02:00
Dragoș Alin Rotaru
c152b39951 Update installation.rst
Fixed small typo
2015-04-02 23:53:19 +03:00
Mateusz Sikora
3e7d72a4a8 Update requirements.pip 2015-04-01 16:05:04 +02:00
Mateusz Sikora
926589ac1d Merge pull request #59 from skylerberg/missing-comma
Fix missing comma in installation settings documentation
2015-03-17 08:27:22 +01:00
Skyler Berg
6c69d7eeda Fix missing comma in installation settings documentation 2015-03-16 20:42:30 -07:00
S.Turgut
fe1eff745e change PasswordResetConfirmSerializer setpasswordform from token invalid value error to form validation error 2015-03-11 12:05:45 +02:00
Mateusz Sikora
cf780c3ebd Update requirements.pip 2015-03-11 10:59:55 +01:00
Mateusz Sikora
8182a33c66 #23 - add test case to cover solcial auth for existing user 2015-02-27 13:56:29 +01:00
Mateusz Sikora
4e24b2a842 Update requirements.pip 2015-02-26 10:16:02 +01:00
Mateusz Sikora
e8ac019b4c Merge pull request #55 from vesterbaek/fix_drf_request
DRF 3 bug: get HttpRequest from DRF request object. Similar to issue #43
2015-02-25 17:38:43 +01:00
Mateusz Sikora
b2316f7de7 Merge pull request #54 from vesterbaek/readonly_email
Mark email as read only for user details
2015-02-25 17:38:07 +01: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
Jeppe Vesterbæk
846040259a Mark email as read only for user details 2015-02-25 16:06:46 +01:00
Mateusz Sikora
200dad30fb Merge branch 'master' of github.com:Tivix/django-rest-auth 2015-02-23 12:57:26 +01:00
Mateusz Sikora
03f5d398f9 update requirements in demo app 2015-02-23 12:57:16 +01:00
Mateusz Sikora
dc809a9a2c update FAQ section in docs 2015-02-23 12:56:42 +01:00
Mateusz Sikora
65770d2915 Update requirements.pip 2015-01-31 11:13:05 +01:00
Mateusz Sikora
3ad7029114 version 0.3.4 2015-01-27 17:13:47 +01:00
Mateusz Sikora
2158fffd2a fix #47 - PasswordResetConfirm doesn't check token 2015-01-27 16:52:54 +01:00
Mateusz Sikora
60c0f949f4 Merge pull request #46 from schemacs/dev
Adjust for djangorestframework 3
2015-01-18 19:36:09 +01:00
Mateusz Sikora
43eba15d2b Update requirements.pip 2015-01-18 19:34:58 +01:00
Lele Long
199a4989c5 Adjust for djangorestframework 3 2015-01-15 23:45:01 +08:00
Mateusz Sikora
ee263cd003 udpate DRA version in demo 2015-01-09 12:48:51 +01:00
Mateusz Sikora
ee8f620e83 version 0.3.3 2015-01-09 12:42:23 +01:00
Mateusz Sikora
7c1fe6fd94 upgrade demo requirements 2015-01-09 12:16:21 +01:00
Mateusz Sikora
01ffd4127b support django-rest-framework v3.0 2015-01-09 12:05:14 +01:00
Mateusz Sikora
e9fee3aa92 Support custom UserDetailsSerializer for registration 2015-01-09 11:20:46 +01:00
Mateusz Sikora
5d53a0e0a0 fix unit tests for social auth - required after changes in allauth v0.19.0 2015-01-09 11:12:00 +01:00
Mateusz Sikora
ed32f907d9 Merge pull request #39 from APSL/master
Support for custom UserDetailsSerializer on Register view
2015-01-09 10:53:01 +01:00
Mateusz Sikora
fbb0ba7732 Merge pull request #35 from jmb/demo-fixes
Demo fixes
2015-01-09 10:51:12 +01:00
Marc
b2d5c221c7 Support for custom UserDetailsSerializer on Register view 2014-12-18 16:52:28 +01:00
Mateusz Sikora
802de89ed7 Merge branch 'master' of github.com:Tivix/django-rest-auth 2014-12-15 00:09:58 +01:00