summaryrefslogtreecommitdiff
path: root/scannerjammer
diff options
context:
space:
mode:
authorPepper <pepper@scannerjammer.com>2015-05-28 14:23:46 -0400
committerPepper <pepper@scannerjammer.com>2015-05-28 14:23:46 -0400
commit4a4a32e1f979282c1b93a43b0dd10f89a0d2d590 (patch)
tree05aa36967a0be9f92030606c538393c52c0f5fa7 /scannerjammer
parenta4916103efb2d97896c456ff0e83064b21e85d25 (diff)
fixed email in profiles
Diffstat (limited to 'scannerjammer')
-rwxr-xr-xscannerjammer/settings.py3
-rwxr-xr-xscannerjammer/urls.py11
2 files changed, 12 insertions, 2 deletions
diff --git a/scannerjammer/settings.py b/scannerjammer/settings.py
index 46be8e7..15889ec 100755
--- a/scannerjammer/settings.py
+++ b/scannerjammer/settings.py
@@ -137,6 +137,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
'django.contrib.admindocs',
+ 'password_reset',
)
# A sample logging configuration. The only tangible logging
@@ -177,7 +178,7 @@ START_TIME = datetime.now()
SERVER_HOST = 'scannerjammer.com'
SERVER_PORT = 80
-SESSION_COOKIE_DOMAIN=".scannerjammer.com"
+SESSION_COOKIE_DOMAIN=".scannerjammer.com"
USE_X_FORWARDED_HOST=True
HAYSTACK_CONNECTIONS = {
diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py
index d8ba0e1..de316f7 100755
--- a/scannerjammer/urls.py
+++ b/scannerjammer/urls.py
@@ -1,11 +1,20 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import *
+
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from password_reset import views
# Uncomment the next two lines to enable the admin:
from django.contrib import admin
admin.autodiscover()
+
urlpatterns = patterns('',
+ url(r'^recover/(?P<signature>.+)/$', views.recover_done,
+ name='password_reset_sent'),
+ url(r'^recover/$', views.recover, name='password_reset_recover'),
+ url(r'^reset/done/$', views.reset_done, name='password_reset_done'),
+ url(r'^reset/(?P<token>[\w:-]+)/$', views.reset,
+ name='password_reset_reset'),
# Examples:
# url(r'^$', 'scannerjammer.views.home', name='home'),
# url(r'^scannerjammer/', include('scannerjammer.foo.urls')),