diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2011-09-19 09:42:44 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2011-09-19 09:42:44 +0800 |
commit | 75d8cf966034e673afe0077ba393d8b2eb3e9b93 (patch) | |
tree | 3f6cf6b9f87ad313d23de77b4c33422e7444a1df /apps/settings.py | |
parent | 539b6596dc1bf1d3118631095625e354026da373 (diff) | |
parent | f1e5f6a2c9d737f12290f5bd5a934b74c362616f (diff) | |
download | patchwork-75d8cf966034e673afe0077ba393d8b2eb3e9b93.tar.bz2 patchwork-75d8cf966034e673afe0077ba393d8b2eb3e9b93.tar.xz |
Merge branch 'notifications'
Diffstat (limited to 'apps/settings.py')
-rw-r--r-- | apps/settings.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/settings.py b/apps/settings.py index 24d3762..7523099 100644 --- a/apps/settings.py +++ b/apps/settings.py @@ -64,7 +64,7 @@ MIDDLEWARE_CLASSES = ( ROOT_URLCONF = 'apps.urls' -LOGIN_URL = '/accounts/login' +LOGIN_URL = '/user/login/' LOGIN_REDIRECT_URL = '/user/' # If you change the ROOT_DIR setting in your local_settings.py, you'll need to @@ -96,13 +96,15 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.admin', 'patchwork', - 'registration', ) DEFAULT_PATCHES_PER_PAGE = 100 DEFAULT_FROM_EMAIL = 'Patchwork <patchwork@patchwork.example.com>' -ACCOUNT_ACTIVATION_DAYS = 7 +CONFIRMATION_VALIDITY_DAYS = 7 + +NOTIFICATION_DELAY_MINUTES = 10 +NOTIFICATION_FROM_EMAIL = DEFAULT_FROM_EMAIL # Set to True to enable the Patchwork XML-RPC interface ENABLE_XMLRPC = False |