diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:15:48 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 06:15:48 +0100 |
| commit | 625b2156e388a92d57fa446c931bbf410f5a4e29 (patch) | |
| tree | 8866421569ba567be82b58a45d90e142c46e5c0a /settings.py | |
| parent | 1a36856b407684a9d48f04e170a160b3c04aa706 (diff) | |
| download | troggle-625b2156e388a92d57fa446c931bbf410f5a4e29.tar.gz troggle-625b2156e388a92d57fa446c931bbf410f5a4e29.tar.bz2 troggle-625b2156e388a92d57fa446c931bbf410f5a4e29.zip | |
[svn] Weeks of local changes.
- Import is now non-destructive
- Parsers write output to a log file (path be specified in settings)
- databaseReset.py content been divided into separate functions which can be called for varying levels of deletion and importing
- control panel (view, template, urlpattern) added for deleting and importing
- Logins and signup fixed
- CaveArea model updated, view, hierarchical url patterns, and beginning of template added
- New site style
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8324 by cucc @ 5/3/2009 5:56 AM
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/settings.py b/settings.py index aae32dd..df5a5e2 100644 --- a/settings.py +++ b/settings.py @@ -35,7 +35,7 @@ USE_I18N = True # Examples: "http://foo.com/media/", "/media/". ADMIN_MEDIA_PREFIX = '/troggle/media-admin/' PHOTOS_ROOT = os.path.join(EXPOWEB, 'photos') -#MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/') +MEDIA_URL = urlparse.urljoin(URL_ROOT , '/site_media/') SURVEYS_URL = urlparse.urljoin(URL_ROOT , '/survey_scans/') PHOTOS_URL = urlparse.urljoin(URL_ROOT , '/photos/') SVX_URL = urlparse.urljoin(URL_ROOT , '/survex/') @@ -80,6 +80,7 @@ INSTALLED_APPS = ( 'django.contrib.redirects', #'photologue', #'troggle.reversion', + 'django_evolution', 'troggle.registration', 'troggle.profiles', 'troggle.expo' |