]> _ Git - cubeextranet.git/commitdiff
wait #4007
authorvincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 29 Oct 2020 12:30:40 +0000 (12:30 +0000)
committervincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Thu, 29 Oct 2020 12:30:40 +0000 (12:30 +0000)
inc/ws/Util/class.ws.exporter.php
inc/ws/Util/html5/master/class.ws.html5.compiler.php
inc/ws/Util/packager/class.ws.packager.mac.exe.html.php

index a6431e53def5b405020ab7c45620e5190128008b..2f8a9de16962cb0780bb7a05c506c0f0cb671dea 100644 (file)
@@ -22,7 +22,6 @@ class wsExporter
     {
         global $core;
 
-
         $ctrl = isset($_GET['ctrl']) && $_GET['ctrl'] == 'true';
         $alt = isset($_GET['alt']) && $_GET['alt'] == 'true';
 
index 25d6ba5e2cf33420a6f47259d69fb154b8d435dc..dc400c74f134ae32798d352924c5ec1a42ff894f 100644 (file)
@@ -416,7 +416,7 @@ class wsHTML5Compiler
         $this->addJsLib('cookie', 'js/libs/jquery/jquery.cookie.js');
         $this->addJsLib('puma', 'js/libs/fluidbook/cart/fluidbook.cart.puma.js');
         $this->addJsLib('html2pdf', 'js/libs/html2pdf/html2pdf.min.js');
-        $this->addJsLib('xlsx', 'js/libs/xlsx.full.min.js');
+        $this->addJsLib('exceljs', 'js/libs/exceljs.min.js');
         $this->addVideoJs();
 
         $this->config->basketReferences = wsUtil::excelToArrayKeyVars($this->wdir . '/commerce/' . $this->book->parametres->basketReferences);
index 698795670347a291e2510ca5f3faeaa1eb79c360..d5fe9493c3a4b49597c401853d0e000bfb5f538a 100644 (file)
@@ -107,7 +107,8 @@ class wsPackagerMacEXEHTML extends wsPackagerWinEXEHTML
 \r
         // Sign app\r
         $cl = new CubeIT_CommandLine($local_root . 'sign');\r
-        $cl->setSSH('paris.cubedesigners.com', 'vincent', 'atacama', 22022);\r
+        //$cl->setSSH('paris.cubedesigners.com', 'vincent', 'atacama', 22022);\r
+        $cl->setSSH('tortuga.enhydra.fr', 'vincent', 'atacama', 22022);\r
         $cl->setArg(null, $local_root . $f);\r
         $cl->execute();\r
         $cl->debug();\r