wip #7474

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 13baf0a989d035cd6792ed0da267f422805e43cb..e32bfbcaeed4b62e3b9b4681e83c4c2ea24d305f 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" autoUpload="Always" serverName="www.fluidbook.com" promptOnLocalOverwrite="false" confirmBeforeUploading="false" confirmBeforeDeletion="false" showAutoUploadSettingsWarning="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="dev.fluidbook.com" promptOnLocalOverwrite="false" confirmBeforeUploading="false" confirmBeforeDeletion="false" showAutoUploadSettingsWarning="false">
     <option name="confirmBeforeDeletion" value="false" />
     <option name="confirmBeforeUploading" value="false" />
     <serverData>
@@ -18,14 +18,14 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="alphaville.cubedesigners.com">
+      <paths name="amadeus.cubedesigners.com">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
-      <paths name="amadeus.cubedesigners.com">
+      <paths name="benhur.cubedesigners.com">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
@@ -109,6 +109,20 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.prescription-quotidien.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="dev.prescription-quotidien.com (Host)">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.rbcmobilier.com">
         <serverdata>
           <mappings>
@@ -228,13 +242,6 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="presquot.dev.cubedesigners.com">
-        <serverdata>
-          <mappings>
-            <mapping local="$PROJECT_DIR$" web="/" />
-          </mappings>
-        </serverdata>
-      </paths>
       <paths name="preview.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -347,6 +354,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="www.bloomsburie.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="www.ccgm.fr">
         <serverdata>
           <mappings>

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 64eac4d1f8ff1935e309a517d844dccc9da0d0ff..5b57a405eba310146032148d4639dc6c43663945 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="try #7257 @2">
-      <change beforePath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/docker-compose.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.docker/dev/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/dev/update" afterDir="false" />
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7474 @0.25">
+      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -846,7 +846,7 @@
       <workItem from="1743588153623" duration="6412000" />
       <workItem from="1743685828952" duration="2161000" />
       <workItem from="1744010760355" duration="3501000" />
-      <workItem from="1744211486656" duration="1254000" />
+      <workItem from="1744211486656" duration="1653000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1191,7 +1191,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="180" />
+    <option name="localTasksCounter" value="181" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1223,7 +1223,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wip #3853 @0.5" />
     <MESSAGE value="wait #3693 @1.5" />
     <MESSAGE value="wait #3885 @0:50" />
     <MESSAGE value="wait #3912 @0:20" />
@@ -1248,7 +1247,8 @@
     <MESSAGE value="wip #3702 @0.25" />
     <MESSAGE value="#7257" />
     <MESSAGE value="try #7257 @2" />
-    <option name="LAST_COMMIT_MESSAGE" value="try #7257 @2" />
+    <MESSAGE value="wip #7474 @0.25" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #7474 @0.25" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index e1e02811cc5a9790eaf44cc7dba4b0980b164c57..b9827311da60fe31b91661998a0a7cafc16aa1b7 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -68,6 +68,20 @@ locales.fr = fr.elearning.fluidbook.com
 
 database.params.dbname = fluidbook-v3-elearning
 
+[testing-learning : learning]
+
+dev=false
+
+seo.robots = false
+
+webhost = dev.elearning.fluidbook.com
+
+locales.en = dev.elearning.fluidbook.com
+locales.fr = fr.dev.elearning.fluidbook.com
+
+database.params.dbname = fluidbook-v3-elearning
+database.params.host = fluidbook-v3-dev-mariadb
+
 [testing : production]
 
 dev = false
@@ -87,7 +101,3 @@ locales.fr = dev.fluidbook.com
 locales.en = en.dev.fluidbook.com
 
 database.params.host = fluidbook-v3-dev-mariadb
-database.params.username = root
-database.params.password = ryruth0YzzuUn7Eq
-database.params.dbname = fluidbook-v3-dev
-