Merge branch 'master' of gitosis@git.auf:auf_savoirs_en_partage_django

diff --git a/auf_savoirs_en_partage/chercheurs/models.py b/auf_savoirs_en_partage/chercheurs/models.py
index f7c7ab7..be9abf8 100644 (file)
--- a/auf_savoirs_en_partage/chercheurs/models.py
+++ b/auf_savoirs_en_partage/chercheurs/models.py
@@ -61,7 +61,7 @@ class Chercheur(models.Model):
     actif = models.BooleanField(editable = False)
     
     def __unicode__(self):
-        return u"%s %s" % (self.personne.nom.upper(), self.personne.prenom)
+        return u"%s %s" % (self.personne.nom.upper(), self.personne.prenom.title())
     
 
 class Groupe(models.Model):

diff --git a/auf_savoirs_en_partage/conf.py.edit b/auf_savoirs_en_partage/conf.py.edit
index 4e3fc3d..0791904 100644 (file)
--- a/auf_savoirs_en_partage/conf.py.edit
+++ b/auf_savoirs_en_partage/conf.py.edit
@@ -7,3 +7,5 @@ DATABASE_PORT = ''             # Set to empty string for default. Not used with
 ROA_API_KEY = ''
 
 CALENDRIER_URL = 'http://davin:davin@cal.ro.auf.org/caldav.php/davin/test/'
+
+AUTH_PASSWORD_REQUIRED = True

diff --git a/auf_savoirs_en_partage/settings.py b/auf_savoirs_en_partage/settings.py
index cca1879..43760ce 100644 (file)
--- a/auf_savoirs_en_partage/settings.py
+++ b/auf_savoirs_en_partage/settings.py
@@ -82,7 +82,6 @@ TEMPLATE_DIRS = (
 AUTHENTICATION_BACKENDS = (
     'auf_references_client.backends.CascadeBackend',
 )
-AUTH_PASSWORD_REQUIRED = True
 
 CACHE_BACKEND = 'memcached://127.0.0.1:11211/'