diff options
| author | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2008-08-05 17:15:33 +0000 |
| commit | aa239e3e5405933af6a29dac3cf587b59a099927 (patch) | |
| tree | ea2cbd139c9a8cf84c09e0b2008bff70e05927ef /django/conf/global_settings.py | |
| parent | 45b73c9a4685809236f84046cc7ffd32a50db958 (diff) | |
gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.archive/attic/gis
git-svn-id: http://code.djangoproject.com/svn/django/branches/gis@8215 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/conf/global_settings.py')
| -rw-r--r-- | django/conf/global_settings.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 2c9720da10..811feed349 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -188,6 +188,9 @@ APPEND_SLASH = True # Whether to prepend the "www." subdomain to URLs that don't have it. PREPEND_WWW = False +# Override the server-derived value of SCRIPT_NAME +FORCE_SCRIPT_NAME = None + # List of compiled regular expression objects representing User-Agent strings # that are not allowed to visit any page, systemwide. Use this for bad # robots/crawlers. Here are a few examples: @@ -363,6 +366,9 @@ LOGOUT_URL = '/accounts/logout/' LOGIN_REDIRECT_URL = '/accounts/profile/' +# The number of days a password reset link is valid for +PASSWORD_RESET_TIMEOUT_DAYS = 3 + ########### # TESTING # ########### |