merge qbe in rh : conflits réglés

[auf_rh_dae.git] / project / settings.py

diff --git a/project/settings.py b/project/settings.py
index 1bd85f2..e6b53bf 100644 (file)
--- a/project/settings.py
+++ b/project/settings.py
@@ -16,7 +16,7 @@ ADMINS = (
 MANAGERS = ADMINS
 
 TIME_ZONE = 'Canada/Montreal'
-DATE_FORMAT = 'd F Y'
+DATE_FORMAT = 'j F Y'
 LANGUAGE_CODE = 'fr-ca'
 
 # Absolute path to the directory that holds media.
@@ -29,6 +29,7 @@ PRIVE_MEDIA_ROOT = os.path.join(os.path.dirname(__file__), 'media_prive')
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
 MEDIA_URL = '/media/'
 PRIVE_MEDIA_URL = '/dae/prive/'
+OE_PRIVE_MEDIA_URL = '/recrutement/prive/'
 
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
@@ -67,17 +68,15 @@ INSTALLED_APPS = (
     'ajax_select',
     'south',
     'reversion',
-    'project.rh', 
+    'project.rh',
     'auf.django.workflow',
     'project.rh_v1',
     'project.dae',
-    #'project.budget',
     'alphafilter',
     'project.recrutement',
     'form_utils',
     'tinymce',
     'captcha',
-#    'private_files', 
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -143,7 +142,6 @@ TINYMCE_DEFAULT_CONFIG = {
 'content_css' : '/media/css/tinymce.css',
 }
 
-EMAIL_HOST = 'localhost'
-EMAIL_PORT = '1025'
+# django-sendfile
 
-#FILE_PROTECTION_METHOD = 'basic'
+SENDFILE_BACKEND = 'sendfile.backends.simple'