diff options
| -rw-r--r-- | templates/registration/password_reset_email.txt (renamed from templates/registration/password_reset_email.html) | 0 | ||||
| -rw-r--r-- | urls.py | 22 |
2 files changed, 0 insertions, 22 deletions
diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.txt index 6b7358cfcf..6b7358cfcf 100644 --- a/templates/registration/password_reset_email.html +++ b/templates/registration/password_reset_email.txt @@ -7,7 +7,6 @@ from django.conf.urls import patterns, include, url from django.views.generic import RedirectView -from django.contrib.auth import views as auth_views from django.contrib import admin admin.autodiscover() @@ -15,27 +14,6 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^layerindex/', include('layerindex.urls')), url(r'^admin/', include(admin.site.urls)), - - # override the default auth urls since django-registration 1.0 isn't Django 1.6 compatible - url(r'^password/change/$', - auth_views.password_change, - name='password_change'), - url(r'^password/change/done/$', - auth_views.password_change_done, - name='password_change_done'), - url(r'^password/reset/$', - auth_views.password_reset, - name='password_reset'), - url(r'^password/reset/done/$', - auth_views.password_reset_done, - name='password_reset_done'), - url(r'^password/reset/complete/$', - auth_views.password_reset_complete, - name='password_reset_complete'), - url(r'^password/reset/confirm/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$', - auth_views.password_reset_confirm, - name='auth_password_reset_confirm'), - url(r'^accounts/', include('registration.backends.default.urls')), url(r'^captcha/', include('captcha.urls')), url(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)), |