From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Tue, 4 Jul 2023 18:06:53 +0000 (+0200)
Subject: Merge branch 'backpack5' into delivery
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=ab4464b9bce55f3c3bc9e673e0efd7f951821b39;p=fluidbook-toolbox.git

Merge branch 'backpack5' into delivery

# Conflicts:
#	app/Models/FluidbookPublication.php
---

ab4464b9bce55f3c3bc9e673e0efd7f951821b39
diff --cc app/Models/FluidbookPublication.php
index 4f4c9353d,7940f174e..13ecd965c
--- a/app/Models/FluidbookPublication.php
+++ b/app/Models/FluidbookPublication.php
@@@ -25,9 -28,9 +28,11 @@@ use App\Http\Controllers\Admin\Operatio
  use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\ExportPdfOperation;
  use App\Http\Controllers\Admin\Operations\FluidbookPublication\Services\SocialImageOperation;
  use App\Http\Controllers\Admin\Operations\FluidbookPublication\StatsOperation;
+ use App\Http\Controllers\Admin\Operations\FluidbookPublication\UpgradeOperation;
  use App\Jobs\FluidbookImagesPreprocess;
+ use App\Jobs\FluidbookSocialImage;
 +use App\Jobs\GenerateDeliveryThumbnailsPreview;
 +use App\Jobs\GenerateSecondPagePreview;
  use App\Models\Base\ToolboxSettingsModel;
  use App\Models\Traits\CheckHash;
  use App\Models\Traits\PublicationSettings;
diff --cc composer.lock
index ed892dae3,18f755b65..3aa9e738b
--- a/composer.lock
+++ b/composer.lock
@@@ -8873,77 -8769,9 +8873,77 @@@
              },
              "time": "2022-09-27T16:11:03+00:00"
          },
 +        {
 +            "name": "simplesoftwareio/simple-qrcode",
 +            "version": "4.2.0",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/SimpleSoftwareIO/simple-qrcode.git",
 +                "reference": "916db7948ca6772d54bb617259c768c9cdc8d537"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/SimpleSoftwareIO/simple-qrcode/zipball/916db7948ca6772d54bb617259c768c9cdc8d537",
 +                "reference": "916db7948ca6772d54bb617259c768c9cdc8d537",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "bacon/bacon-qr-code": "^2.0",
 +                "ext-gd": "*",
 +                "php": ">=7.2|^8.0"
 +            },
 +            "require-dev": {
 +                "mockery/mockery": "~1",
 +                "phpunit/phpunit": "~9"
 +            },
 +            "suggest": {
 +                "ext-imagick": "Allows the generation of PNG QrCodes.",
 +                "illuminate/support": "Allows for use within Laravel."
 +            },
 +            "type": "library",
 +            "extra": {
 +                "laravel": {
 +                    "providers": [
 +                        "SimpleSoftwareIO\\QrCode\\QrCodeServiceProvider"
 +                    ],
 +                    "aliases": {
 +                        "QrCode": "SimpleSoftwareIO\\QrCode\\Facades\\QrCode"
 +                    }
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "SimpleSoftwareIO\\QrCode\\": "src"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Simple Software LLC",
 +                    "email": "support@simplesoftware.io"
 +                }
 +            ],
 +            "description": "Simple QrCode is a QR code generator made for Laravel.",
 +            "homepage": "https://www.simplesoftware.io/#/docs/simple-qrcode",
 +            "keywords": [
 +                "Simple",
 +                "generator",
 +                "laravel",
 +                "qrcode",
 +                "wrapper"
 +            ],
 +            "support": {
 +                "issues": "https://github.com/SimpleSoftwareIO/simple-qrcode/issues",
 +                "source": "https://github.com/SimpleSoftwareIO/simple-qrcode/tree/4.2.0"
 +            },
 +            "time": "2021-02-08T20:43:55+00:00"
 +        },
          {
              "name": "spatie/db-dumper",
-             "version": "3.3.1",
+             "version": "3.4.0",
              "source": {
                  "type": "git",
                  "url": "https://github.com/spatie/db-dumper.git",