From: Vincent Vanwaelscappel Date: Fri, 8 Sep 2023 06:58:21 +0000 (+0200) Subject: wip #6254 X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=85decebaaa7763e06e722bef1a656cf8245f2fa9;p=fluidbook-toolbox.git wip #6254 --- diff --git a/app/SubForms/Link/Base.php b/app/SubForms/Link/Base.php index de95260af..f24eae5f9 100644 --- a/app/SubForms/Link/Base.php +++ b/app/SubForms/Link/Base.php @@ -76,7 +76,7 @@ class Base extends Form ['type' => \Fluidbook\Tools\Links\Link::IMAGE, 'label' => __('Image'), 'color' => '#BE418D', 'class' => Image::class], ['type' => \Fluidbook\Tools\Links\Link::LAYER, 'label' => __('Animation de calque'), 'color' => '#3D0254', 'class' => Layer::class], ['type' => \Fluidbook\Tools\Links\Link::TEXT, 'label' => __('Texte'), 'color' => '#9090FF', 'class' => \App\SubForms\Link\Text::class], - ['type' => \Fluidbook\Tools\Links\Link::TEXT_POPUP, 'label' => __('Texte') . ' (' . __('popup') . ')', 'color' => '#05625a', 'class' => \App\SubForms\Link\TextPopup::class], + ['type' => \Fluidbook\Tools\Links\Link::TEXT_POPUP, 'label' => __('Texte') . ' (' . __('popup') . ')', 'color' => '#05625a', 'class' => TextPopup::class], ['type' => \Fluidbook\Tools\Links\Link::MULTIMEDIA, 'label' => __('Multimédia'), 'color' => '#ff00ff', 'class' => Multimedia::class], ['type' => \Fluidbook\Tools\Links\Link::WEB_INFOS, 'label' => __('Adresse web « plus d\'infos »'), 'color' => '#ff0000', 'class' => WebInfos::class], ['type' => \Fluidbook\Tools\Links\Link::CUSTOM, 'label' => __('Personnalisé'), 'color' => '#14511a', 'class' => Custom::class], @@ -106,6 +106,7 @@ class Base extends Form ['type' => \Fluidbook\Tools\Links\Link::PDF, 'label' => __('PDF'), 'color' => '#af48d1', 'class' => PDF::class], ['type' => \Fluidbook\Tools\Links\Link::ACTION, 'label' => __('Action'), 'color' => '#880000', 'class' => Action::class], ['type' => \Fluidbook\Tools\Links\Link::LOTTIE, 'label' => __('Animation Lottie'), 'color' => '#ffaaff', 'class' => Lottie::class], + ['type' => \Fluidbook\Tools\Links\Link::COPY_TO_CLIPBOARD, 'label' => __('Copier un texte dans le presse-papiers'), 'color' => '#437ac7', 'class' => CopyToClipboard::class], //['type' => \Fluidbook\Tools\Links\Link::HTML5MULTIMEDIA, 'label' => __('Lien Multimédia (HTML)'), 'color' => '#34A853', 'disabled' => true, 'class' => Web::class], //['type' => \Fluidbook\Tools\Links\Link::BOOKMARK_CORNER, 'label' => __('Lien marque-page sur coin de page'), 'color' => '#000000', 'disabled' => true, 'class' => Web::class], //['type' => \Fluidbook\Tools\Links\Link::PAGE_CORNER, 'label' => __('Coin de page'), 'color' => '#f19043', 'disabled' => true, 'class' => Web::class], diff --git a/composer.lock b/composer.lock index 703863f99..e58a12c3e 100644 --- a/composer.lock +++ b/composer.lock @@ -1418,13 +1418,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git", - "reference": "30c5b062d7262a844c10dc5ab347368c7f9e4a40" + "reference": "b7e1a379de348fa59bcc6a14d056981603d53765" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack5-82b4df.tar", - "reference": "30c5b062d7262a844c10dc5ab347368c7f9e4a40", - "shasum": "6929e898f2f7ec4ae1ea68d44574fb960a3c4e63" + "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack5-41e85f.tar", + "reference": "b7e1a379de348fa59bcc6a14d056981603d53765", + "shasum": "7876799c0e1afdb8ec958d9a397c0211653f9e91" }, "require": { "cubist/cms-back": "dev-backpack5", @@ -1456,7 +1456,7 @@ } ], "description": "Cubedesigners common users database", - "time": "2023-08-25T13:51:47+00:00" + "time": "2023-09-05T08:44:19+00:00" }, { "name": "cubist/azuretts", @@ -1507,13 +1507,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_cms-back.git", - "reference": "8347c8cf43d79c84d91a61ce3869182393c3b4ae" + "reference": "8b43e1063d420fa27b030c3c2cd9126439e41f9f" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-c43c83.tar", - "reference": "8347c8cf43d79c84d91a61ce3869182393c3b4ae", - "shasum": "f20ba867467ecb7dbf229b1fce71276edcaadb4f" + "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack5-3702f9.tar", + "reference": "8b43e1063d420fa27b030c3c2cd9126439e41f9f", + "shasum": "488d6cf28f9d976507e80821423cee95eaab2efc" }, "require": { "backpack/backupmanager": "^v3.0.9", @@ -1592,7 +1592,7 @@ } ], "description": "Cubist Backpack extension", - "time": "2023-08-24T10:46:06+00:00" + "time": "2023-09-07T08:05:47+00:00" }, { "name": "cubist/cms-front", @@ -1928,13 +1928,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/cubist_pdf.git", - "reference": "aa082e3acaca6bef981ae178938945af5e5eb2ca" + "reference": "0413f5d2b2ef26068757d79f81a22654eedc8bb3" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-ffceb2.tar", - "reference": "aa082e3acaca6bef981ae178938945af5e5eb2ca", - "shasum": "ab0ed6813ff314253079f48f9101395b42d32538" + "url": "https://composer.cubedesigners.com/dist/cubist/pdf/cubist-pdf-dev-master-21001b.tar", + "reference": "0413f5d2b2ef26068757d79f81a22654eedc8bb3", + "shasum": "5d13b5b8e376d3486e03d15a9ef3365054c30360" }, "require": { "cubist/util": "dev-master", @@ -1970,7 +1970,7 @@ "cubist", "pdf" ], - "time": "2023-06-05T10:42:49+00:00" + "time": "2023-09-07T15:59:20+00:00" }, { "name": "cubist/scorm", @@ -3671,13 +3671,13 @@ "source": { "type": "git", "url": "git://git.cubedesigners.com/fluidbook_tools.git", - "reference": "6403402f862efe484adafb2f5649dc49c776e9e5" + "reference": "06926ace231d5b38499411facf52b3647f4e0a34" }, "dist": { "type": "tar", - "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-915608.tar", - "reference": "6403402f862efe484adafb2f5649dc49c776e9e5", - "shasum": "e67381f76823c113bb38dcca8e92ad5fc6f2d6dd" + "url": "https://composer.cubedesigners.com/dist/fluidbook/tools/fluidbook-tools-dev-master-a3c6a5.tar", + "reference": "06926ace231d5b38499411facf52b3647f4e0a34", + "shasum": "2b98542fd40d84f8dc095686d97613214c52802a" }, "require": { "barryvdh/laravel-debugbar": "*", @@ -3711,7 +3711,7 @@ } ], "description": "Fluidbook Tools", - "time": "2023-09-01T15:06:53+00:00" + "time": "2023-09-08T06:47:48+00:00" }, { "name": "fruitcake/php-cors", @@ -4947,16 +4947,16 @@ }, { "name": "laravel/framework", - "version": "v10.21.1", + "version": "v10.22.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ae93199f5349fd8a02364424249aad2a90185a95" + "reference": "9234388a895206d4e1df37342b61adc67e5c5d31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ae93199f5349fd8a02364424249aad2a90185a95", - "reference": "ae93199f5349fd8a02364424249aad2a90185a95", + "url": "https://api.github.com/repos/laravel/framework/zipball/9234388a895206d4e1df37342b61adc67e5c5d31", + "reference": "9234388a895206d4e1df37342b61adc67e5c5d31", "shasum": "" }, "require": { @@ -5143,7 +5143,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2023-09-04T14:34:36+00:00" + "time": "2023-09-05T13:20:01+00:00" }, { "name": "laravel/prompts", @@ -5587,16 +5587,16 @@ }, { "name": "league/flysystem", - "version": "3.15.1", + "version": "3.16.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a141d430414fcb8bf797a18716b09f759a385bed" + "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a141d430414fcb8bf797a18716b09f759a385bed", - "reference": "a141d430414fcb8bf797a18716b09f759a385bed", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4fdf372ca6b63c6e281b1c01a624349ccb757729", + "reference": "4fdf372ca6b63c6e281b1c01a624349ccb757729", "shasum": "" }, "require": { @@ -5605,6 +5605,8 @@ "php": "^8.0.2" }, "conflict": { + "async-aws/core": "<1.19.0", + "async-aws/s3": "<1.14.0", "aws/aws-sdk-php": "3.209.31 || 3.210.0", "guzzlehttp/guzzle": "<7.0", "guzzlehttp/ringphp": "<1.1.1", @@ -5624,7 +5626,7 @@ "microsoft/azure-storage-blob": "^1.1", "phpseclib/phpseclib": "^3.0.14", "phpstan/phpstan": "^0.12.26", - "phpunit/phpunit": "^9.5.11", + "phpunit/phpunit": "^9.5.11|^10.0", "sabre/dav": "^4.3.1" }, "type": "library", @@ -5659,7 +5661,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.15.1" + "source": "https://github.com/thephpleague/flysystem/tree/3.16.0" }, "funding": [ { @@ -5671,20 +5673,20 @@ "type": "github" } ], - "time": "2023-05-04T09:04:26+00:00" + "time": "2023-09-07T19:22:17+00:00" }, { "name": "league/flysystem-local", - "version": "3.15.0", + "version": "3.16.0", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem-local.git", - "reference": "543f64c397fefdf9cfeac443ffb6beff602796b3" + "reference": "ec7383f25642e6fd4bb0c9554fc2311245391781" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/543f64c397fefdf9cfeac443ffb6beff602796b3", - "reference": "543f64c397fefdf9cfeac443ffb6beff602796b3", + "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/ec7383f25642e6fd4bb0c9554fc2311245391781", + "reference": "ec7383f25642e6fd4bb0c9554fc2311245391781", "shasum": "" }, "require": { @@ -5719,7 +5721,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem-local/issues", - "source": "https://github.com/thephpleague/flysystem-local/tree/3.15.0" + "source": "https://github.com/thephpleague/flysystem-local/tree/3.16.0" }, "funding": [ { @@ -5731,7 +5733,7 @@ "type": "github" } ], - "time": "2023-05-02T20:02:14+00:00" + "time": "2023-08-30T10:23:59+00:00" }, { "name": "league/glide", @@ -6586,16 +6588,16 @@ }, { "name": "nesbot/carbon", - "version": "2.69.0", + "version": "2.70.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c" + "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4308217830e4ca445583a37d1bf4aff4153fa81c", - "reference": "4308217830e4ca445583a37d1bf4aff4153fa81c", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d3298b38ea8612e5f77d38d1a99438e42f70341d", + "reference": "d3298b38ea8612e5f77d38d1a99438e42f70341d", "shasum": "" }, "require": { @@ -6688,7 +6690,7 @@ "type": "tidelift" } ], - "time": "2023-08-03T09:00:52+00:00" + "time": "2023-09-07T16:43:50+00:00" }, { "name": "nette/schema", @@ -9475,16 +9477,16 @@ }, { "name": "spatie/laravel-medialibrary", - "version": "10.12.1", + "version": "10.12.2", "source": { "type": "git", "url": "https://github.com/spatie/laravel-medialibrary.git", - "reference": "0e97c0f8b8ad1f1601669cedc456e72436fe67db" + "reference": "38af83a445a9ccffede87b7251102580b6f3883f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/0e97c0f8b8ad1f1601669cedc456e72436fe67db", - "reference": "0e97c0f8b8ad1f1601669cedc456e72436fe67db", + "url": "https://api.github.com/repos/spatie/laravel-medialibrary/zipball/38af83a445a9ccffede87b7251102580b6f3883f", + "reference": "38af83a445a9ccffede87b7251102580b6f3883f", "shasum": "" }, "require": { @@ -9567,7 +9569,7 @@ ], "support": { "issues": "https://github.com/spatie/laravel-medialibrary/issues", - "source": "https://github.com/spatie/laravel-medialibrary/tree/10.12.1" + "source": "https://github.com/spatie/laravel-medialibrary/tree/10.12.2" }, "funding": [ { @@ -9579,7 +9581,7 @@ "type": "github" } ], - "time": "2023-09-04T07:56:53+00:00" + "time": "2023-09-05T07:56:04+00:00" }, { "name": "spatie/laravel-package-tools", @@ -15147,16 +15149,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.1", + "version": "1.24.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" + "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", - "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", "shasum": "" }, "require": { @@ -15188,9 +15190,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.0" }, - "time": "2023-08-03T16:32:59+00:00" + "time": "2023-09-07T20:46:32+00:00" }, { "name": "phpunit/php-code-coverage",