diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-06-07 17:24:22 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-06-07 17:24:22 +0200 |
| commit | 3835ed15d6fb0fd63e22a728f790fe564d9b4a32 (patch) | |
| tree | 35bdf226cddd70a96abd4e14b4175debd036b804 /settings.py | |
| parent | 5b0240709be25116b950ed39301553b51778f967 (diff) | |
| parent | 55d98517fede51fb945f48ecb73a02e52ebd4158 (diff) | |
| download | Chimère - projet de référence-3835ed15d6fb0fd63e22a728f790fe564d9b4a32.tar.bz2 Chimère - projet de référence-3835ed15d6fb0fd63e22a728f790fe564d9b4a32.zip | |
Merge branch 'v2.0'
Conflicts:
settings.py
Diffstat (limited to 'settings.py')
| -rw-r--r-- | settings.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/settings.py b/settings.py index 0918e93..677cf83 100644 --- a/settings.py +++ b/settings.py @@ -4,7 +4,7 @@ # Don't edit this file: # overload all theses settings in your local_settings.py file -import os +import os, sys _ = lambda s: s DEBUG = False @@ -19,6 +19,8 @@ CONTACT_EMAIL = '' STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' +STATICFILES_DIRS = (ROOT_PATH + 'project_static',) + TINYMCE_URL = '/tinymce/' JQUERY_JS_URLS = ('/javascript/jquery/jquery.js', '/javascript/jquery-ui/jquery-ui.js',) @@ -112,6 +114,9 @@ CHIMERE_THUMBS_SCALE_WIDTH=None CHIMERE_CSV_ENCODING = 'ISO-8859-1' +# generic contact email +CONTACT_EMAIL = '' + ADMINS = ( # ('Your Name', 'your_email@domain.com'), ) @@ -129,6 +134,9 @@ DATABASES = { }, } +if 'test' in sys.argv: + SOUTH_TESTS_MIGRATE = False + # Local time zone for this installation. Choices can be found here: # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE # although not all variations may be possible on all operating systems. |