diff options
| author | Madhusudan.C.S | 2010-11-18 16:10:38 +0530 |
|---|---|---|
| committer | Madhusudan.C.S | 2010-11-18 16:10:38 +0530 |
| commit | d6ea90a603cc63df5d150cd9bd99f72153169ea5 (patch) | |
| tree | cd5abd9c78a6a2e07624b9287e51772fbb51391b /project/settings.py | |
| parent | 30321b89d9435f1529122a93aacd37dde2db04c7 (diff) | |
| parent | 1e2a6b85b2f7bd9e391c4b700fbf5b62cb93e13f (diff) | |
| download | scipycon-d6ea90a603cc63df5d150cd9bd99f72153169ea5.tar.gz scipycon-d6ea90a603cc63df5d150cd9bd99f72153169ea5.tar.bz2 scipycon-d6ea90a603cc63df5d150cd9bd99f72153169ea5.zip | |
Merge the south migration branch with an additional field for Laptop registration number with default branch.
--HG--
branch : south-migration
Diffstat (limited to 'project/settings.py')
| -rw-r--r-- | project/settings.py | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/project/settings.py b/project/settings.py index b8a94ba..0287cf2 100644 --- a/project/settings.py +++ b/project/settings.py @@ -7,6 +7,7 @@ ADMINS = ( MANAGERS = ADMINS +DEBUG=False DATABASE_HOST = '' DATABASE_PORT = '' @@ -77,3 +78,29 @@ DEFAULT_FROM_EMAIL = 'admin@scipy.in' CURRENT_SCOPE = 'scipyin/2010' LOGIN_URL = '/%s/login' % (CURRENT_SCOPE) + +DATABASE_ENGINE = 'sqlite3' +DATABASE_NAME = 'scipycon.db' +DATABASE_USER = '' +DATABASE_PASSWORD = '' + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.comments', + 'django.contrib.sessions', + 'django.contrib.admin', + 'django.contrib.sites', + 'django.contrib.flatpages', + 'django.contrib.markup', + 'django.contrib.sitemaps', + 'project.scipycon', + 'project.scipycon.base', + 'project.scipycon.proceedings', + 'project.scipycon.registration', + 'project.scipycon.user', + 'project.scipycon.talk', + 'tagging', + 'robots', +) + |