diff options
| -rwxr-xr-x | scipy2017/urls.py | 2 | ||||
| -rwxr-xr-x | website/templates/cfp.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scipy2017/urls.py b/scipy2017/urls.py index e785820..8ec2e59 100755 --- a/scipy2017/urls.py +++ b/scipy2017/urls.py @@ -11,7 +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'^pass-reset/', include('website.urls_password_reset')), + url(r'^', include('website.urls_password_reset')), url(r'^', include('social.apps.django_app.urls', namespace='social')), url(r'^', include('django.contrib.auth.urls', namespace='auth')) ) diff --git a/website/templates/cfp.html b/website/templates/cfp.html index 34e9125..ee8a739 100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -90,7 +90,7 @@ {{ form.as_p }} <button class="button special" name ="login" type="submit">Login</button><br/><br/> <a style="padding-right : 20px;" href="{% url 'website:userregister' %}" class="btn btn btn-primary">Create an Account</a> - <a href="/pass-reset/forgotpassword/">Forgot Password?</a> + <a href="/2017/forgotpassword/">Forgot Password?</a> {% csrf_token %} </form> <!-- </div> --> |