From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 18 Dec 2017 10:19:29 +0000 (+0100)
Subject: Merge branch 'dev' of https://github.com/Ircam-Web/Mezzo into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=82103dc895f4e147ab7c9540d4b93f4a62db57d3;p=mezzo.git

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

82103dc895f4e147ab7c9540d4b93f4a62db57d3
diff --cc app/local_settings.py
index 50da5f11,77a960b3..34c8cdc3
--- a/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 565bc00e,00000000..e77455fd
mode 160000,000000..160000
--- a/var
+++ b/var
@@@ -1,1 -1,0 +1,1 @@@
- Subproject commit 565bc00e1237ee60b7c8733339a7f82112230989
++Subproject commit e77455fdbd4716d6b517fef6b1098629657bd357