Merge branch 'dev' of https://github.com/Ircam-Web/Mezzo into dev

diff --cc app/local_settings.py
index 50da5f11dea71894d5cc75d5f8477fae8c48bfb7,77a960b35eda158280564f7f2fc7103e03fd9463..34c8cdc3c9dc5f64c7e68262a9870be2740b3dc2
--- 1/app/local_settings.py
--- 2/app/local_settings.py
+++ b/app/local_settings.py
@@@ -87,26 -87,3 +87,25 @@@ FIGGO_API_HEADER_AUTH='Lucca applicatio
  #     ('vertigo.starts.eu', 'organization_themes.vertigo-themes.vertigo_starts_eu'),
  #     ('www.starts.eu', 'organization_themes.vertigo-themes.www_starts_eu'),
  # ]
- 
 +
 +# TIMESHEET
 +
 +TIMESHEET_USER_TEST = 849  # Emilie Zawadzki
 +TIMESHEET_LOG_PATH = "/var/log/cron/"
 +
 +if DEBUG:
 +    TIMESHEET_MASTER_MAIL = "zawadzki@ircam.fr"
 +else:
 +    TIMESHEET_MASTER_MAIL = "Hugues.Vinet@ircam.fr"
 +
 +MEDIA_BASE_URL = 'https://medias.ircam.fr/embed/media/'
 +
 +
 +if DEBUG:
 +    PROTOCOLE = "http://"
 +else:
 +    PROTOCOLE = "https://"
 +
 +HAL_URL_PART_1 = PROTOCOLE + "haltools.archives-ouvertes.fr/Public/afficheRequetePubli.php?labos_exp=%s&affi_exp=%s"
 +HAL_URL_PART_2 = "&CB_auteur=oui&CB_titre=oui&CB_article=oui&langue=Anglais&tri_exp=annee_publi&tri_exp2=typdoc" \
 +                "&tri_exp3=date_publi&ordre_aff=TA&Fen=Aff&css=" + PROTOCOLE + "%s/static/css/index.min.css"

diff --cc var
index 565bc00e1237ee60b7c8733339a7f82112230989,0000000000000000000000000000000000000000..e77455fdbd4716d6b517fef6b1098629657bd357
mode 160000,000000..160000
--- 1/var
--- /dev/null
+++ b/var
@@@ -1,1 -1,0 +1,1 @@@
- Subproject commit 565bc00e1237ee60b7c8733339a7f82112230989
++Subproject commit e77455fdbd4716d6b517fef6b1098629657bd357