summaryrefslogtreecommitdiff
path: root/scipy2017
diff options
context:
space:
mode:
authorPrashant S2017-09-19 15:19:38 +0530
committerGitHub2017-09-19 15:19:38 +0530
commit7b20ffdfdb87d72042e4bf65b596bbc325114b62 (patch)
tree72ff75b5632dd68f92fb2e9f090969dabbc5a8d4 /scipy2017
parentba24f75b6f9387b5433e8eed12ef8b63666480fd (diff)
parent96410e298563536e790c620ca3842c98dba66e35 (diff)
downloadSciPy2017-7b20ffdfdb87d72042e4bf65b596bbc325114b62.tar.gz
SciPy2017-7b20ffdfdb87d72042e4bf65b596bbc325114b62.tar.bz2
SciPy2017-7b20ffdfdb87d72042e4bf65b596bbc325114b62.zip
Merge pull request #9 from Sashi20/devel
Forgot Password url fixed
Diffstat (limited to 'scipy2017')
-rwxr-xr-xscipy2017/urls.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/scipy2017/urls.py b/scipy2017/urls.py
index 057f6e5..2f4adc9 100755
--- a/scipy2017/urls.py
+++ b/scipy2017/urls.py
@@ -11,18 +11,7 @@ urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^', include('website.urls', namespace='website')),
url(r'^2017/', include('website.urls', namespace='website')),
+ url(r'^2017/', include('website.urls_password_reset')),
url(r'^', include('social.apps.django_app.urls', namespace='social')),
- url(r'^', include('django.contrib.auth.urls', namespace='auth')),
-
- url(r'^forgotpassword/$', password_reset, {'template_name': 'register/password_reset_form.html'}, name="password_reset"),
- url(r'^password_reset/(?P<uidb64>[0-9A-Za-z]+)-(?P<token>.+)/$',
- password_reset_confirm, {'template_name': 'register/password_reset_confirm.html'}, name='password_reset_confirm'),
- url(r'^password_reset/mail_sent/$', password_reset_done, {'template_name': 'register/password_reset_done.html'},
- name='password_reset_done'),
- url(r'^password_reset/complete/$', password_reset_complete, {'template_name': 'register/password_reset_complete.html'},
- name='password_reset_complete'),
- url(r'^changepassword/$', password_change, {'template_name': 'register/password_change_form.html'},
- name='password_change'),
- url(r'^password_change/done/$', password_change_done, {'template_name': 'register/password_change_done.html'},
- name='password_change_done'),
+ url(r'^', include('django.contrib.auth.urls', namespace='auth'))
)