projects
/
matthijs
/
projects
/
dorestad-bookings.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
phpbb: Make the username case-insensitve on login again.
[matthijs/projects/dorestad-bookings.git]
/
settings.py
diff --git
a/settings.py
b/settings.py
index c6bd83d6a5771d0b205f27bd1cdade4fdd01d029..54df1e2ef3355f9e09e5353a91ca7b25b831c1f3 100644
(file)
--- a/
settings.py
+++ b/
settings.py
@@
-17,6
+17,10
@@
MANAGERS = ADMINS
# Import database settings from a default file (so we can keep those out
# of git).
from dbsettings import *
# Import database settings from a default file (so we can keep those out
# of git).
from dbsettings import *
+# Import alternative database settings for when running a south schema
+# migration. The soutsettings.py takes care of detecting this case and
+# prompting for a password, then.
+from southsettings import *
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@
-34,6
+38,8
@@
SITE_ID = 1
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
# If you set this to False, Django will make some optimizations so as not
# to load the internationalization machinery.
USE_I18N = True
+# Also use localization (formatting of numbers and dates)
+USE_L10N = True
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
# Absolute path to the directory that holds media.
# Example: "/home/media/media.lawrence.com/"
@@
-47,7
+53,7
@@
MEDIA_URL = ''
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
# trailing slash.
# Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '/
admin/
media/'
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'dd1=%ckg%xhi((eq)^@ri0o62trw-j!3(4bed9#u5)$_h&a!)0'
# Make this unique, and don't share it with anybody.
SECRET_KEY = 'dd1=%ckg%xhi((eq)^@ri0o62trw-j!3(4bed9#u5)$_h&a!)0'
@@
-64,6
+70,7
@@
MIDDLEWARE_CLASSES = (
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
+ 'debug_toolbar.middleware.DebugToolbarMiddleware',
)
ROOT_URLCONF = 'dorestad-bookings.urls'
)
ROOT_URLCONF = 'dorestad-bookings.urls'
@@
-80,7
+87,12
@@
LOGIN_REDIRECT_URL = "/reserveren/"
INSTALLED_APPS = (
'django.contrib.auth',
INSTALLED_APPS = (
'django.contrib.auth',
+ 'django.contrib.contenttypes',
+ 'django.contrib.sessions',
+ 'django.contrib.admin',
'tickets',
'tickets',
+ 'debug_toolbar',
+ 'south',
)
TEMPLATE_CONTEXT_PROCESSORS = (
)
TEMPLATE_CONTEXT_PROCESSORS = (