Skip to content

Commit f848c8b

Browse files
committed
Merge remote-tracking branch 'Tivix/django-rest-auth/master'
2 parents 52f04ba + 4889cb5 commit f848c8b

16 files changed

+256
-238
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
install:
88
- pip install -q Django==$DJANGO --use-mirrors
99
- pip install coveralls
10-
- pip install -r test_requirements.pip
10+
- pip install -r rest_auth/tests/requirements.pip
1111
script:
1212
- coverage run --source=rest_auth setup.py test
1313
after_success:

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ Source code
2626
https://github.com/Tivix/django-rest-auth
2727

2828

29-
StackOverflow
29+
Stack Overflow
3030
-----------
3131
http://stackoverflow.com/questions/tagged/django-rest-auth

demo/requirements.pip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
django>=1.7.0
2-
django-rest-auth==0.5.0
2+
django-rest-auth==0.6.0
33
django-allauth==0.24.1
44
six==1.9.0

docs/changelog.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Changelog
22
=========
33

4+
0.6.0
5+
-----
6+
- dropped support for Python 2.6
7+
- dropped support for Django 1.6
8+
- fixed demo code
9+
- added better validation support for serializers
10+
- added optional logout after password change
11+
- compatibility fixes
12+
- bugfixes
13+
414
0.5.0
515
-----
616
- replaced request.DATA with request.data for compatibility with DRF 3.2

docs/installation.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Registration (optional)
5757
5858
urlpatterns = patterns('',
5959
...,
60-
(r'^rest-auth/', include('rest_auth.urls')),
61-
(r'^rest-auth/registration/', include('rest_auth.registration.urls'))
60+
url(r'^rest-auth/', include('rest_auth.urls')),
61+
url(r'^rest-auth/registration/', include('rest_auth.registration.urls'))
6262
)
6363
6464

rest_auth/serializers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def validate_email(self, value):
115115
if not self.reset_form.is_valid():
116116
raise serializers.ValidationError(_('Error'))
117117

118-
if not UserModel.objects.filter(email=value).exists():
118+
if not UserModel.objects.filter(email__iexact=value).exists():
119119
raise serializers.ValidationError(_('Invalid e-mail address'))
120120

121121
return value

rest_auth/tests/__init__.py

Whitespace-only changes.
File renamed without changes.
File renamed without changes.

test_settings.py renamed to rest_auth/tests/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import sys
33

44
PROJECT_ROOT = os.path.abspath(os.path.split(os.path.split(__file__)[0])[0])
5+
56
ROOT_URLCONF = 'urls'
67
STATIC_URL = '/static/'
78
STATIC_ROOT = '%s/staticserve' % PROJECT_ROOT

0 commit comments

Comments
 (0)