From: Emilie <zawadzki@ircam.fr>
Date: Fri, 8 Dec 2017 14:00:47 +0000 (+0100)
Subject: resolve conficts
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=ae66f9bde45c68223fd665919d5ed7aad6ad01d8;p=mezzo.git

resolve conficts
---

ae66f9bde45c68223fd665919d5ed7aad6ad01d8
diff --cc .gitmodules
index 62017512,5fa55236..8d9623b3
--- a/.gitmodules
+++ b/.gitmodules
@@@ -28,15 -28,9 +28,15 @@@
  [submodule "lib/mezzanine-organization"]
  	path = lib/mezzanine-organization
  	url = https://github.com/Ircam-Web/mezzanine-organization.git
-     branch-master = mezzo
-     branch-dev = mezzo
+     branch-master = master
+     branch-dev = master
      ignore = dirty
 +[submodule "var"]
 +	path = var
 +	url = git+ssh://git@git.forge.ircam.fr/ircam-www-data.git
 +    ignore = dirty
 +	branch-master = master
 +	branch-dev = master
  [submodule "lib/cartridge"]
  	path = lib/cartridge
      url = https://github.com/Ircam-Web/cartridge.git
diff --cc app/local_settings.py
index da21d147,5d05c65f..ad6e428e
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@@ -87,12 -87,3 +87,13 @@@ 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'),
  # ]
 +
 +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"
++