]> _ Git - fluidbook-toolbox.git/commitdiff
Merge branch 'backpack5' into quiz2
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 7 Nov 2023 06:31:16 +0000 (07:31 +0100)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 7 Nov 2023 06:31:16 +0000 (07:31 +0100)
# Conflicts:
# composer.json
# composer.lock

1  2 
.docker/dev/docker-compose.yml
.docker/docker-compose.yml
app/Fluidbook/Packager/Download.php
app/Models/FluidbookPublication.php
composer.json
package-lock.json

Simple merge
Simple merge
index ff91d6ccc4689f9b62e490a1acd7ff2aaf39a266,c9b1ef2c1c7663e67461e3d514830c5965331cb1..a6a477c143e4ac347206db93ff3c4c396c4391b3
@@@ -97,8 -104,9 +104,9 @@@ class Download extends DownloadBas
  
                  if ($this->action === 'scormcloud') {
                      try {
 -                        $scormURL = ScormCloud::send($url, 'toolbox_' . $this->type . '_' . $this->_id());
 +                        $scormURL = ScormCloud::send($url, env('SCORM_CLOUD_PREFIX', 'toolbox_') . $this->type . '_' . $this->_id());
                          $actions[__('Tester sur SCORM Cloud')] = $scormURL;
+                         $res[] = $url;
                      } catch (\Exception $e) {
  
                      }
Simple merge
diff --cc composer.json
index 865e6deee9666f9c1ace9658b6b652ffbc4c7448,bcf4980f51365b8e3d4a0f6543bd285acbc7e7ad..b7fdb85d6bc2b4fe9b5d59f1f80e6664e9956417
          "rickselby/laravel-gate-cache": "^3.6",
          "rodneyrehm/plist": "^2.0",
          "rustici-software/scormcloud-api-v2-client-php": "^2.1.0",
-         "symfony/http-client": "^v6.3.0"
+         "simplesoftwareio/simple-qrcode": "^4.2",
 +        "ryangjchandler/standalone-blade": "^0.2.0",
+         "symfony/http-client": "^v6.3.0",
+         "voku/simple_html_dom": "^4.8"
      },
      "require-dev": {
          "spatie/laravel-ignition": "^2.1.3",
Simple merge