blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapted composer.json and includes to be compatible to composer version 2

Browse Source
This commit is contained in:
Paolo
2022-06-07 14:56:33 +02:00
parent f3fe3aa099
commit 618a62425b
5 changed files with 46 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/templates/FHC-Footer.php
+3 -3
View File
@@ -71,10 +71,10 @@
// SB Admin 2 template JS
if ($sbadmintemplate3 === true)
{
generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
generateJSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
generateJSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
generateBackwardCompatibleJSMsIe('vendor/afarkas/html5shiv/dist/html5shiv.min.js');
generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js');
generateBackwardCompatibleJSMsIe('vendor/scottjehl/respond/dest/respond.min.js');
}
// Table sorter JS
application/views/templates/FHC-Header.php
+2 -2
View File
@@ -59,8 +59,8 @@
// SB Admin 2 template CSS
if ($sbadmintemplate3 === true)
{
generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
generateCSSsInclude('vendor/blackrockdigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
}
// Securimage CSS
application/views/templates/header.php
+3 -2
View File
@@ -41,12 +41,12 @@ if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and in
<?php endif ?>
<?php if($jqueryV1) : ?>
<script type="text/javascript" src="<?php echo base_url('vendor/jquery/jqueryV1/jquery-1.12.4.min.js'); ?>"></script>
<script type="text/javascript" src="<?php echo base_url('vendor/jquery/jquery1/jquery-1.12.4.min.js'); ?>"></script>
<script type="text/javascript" src="<?php echo base_url('vendor/christianbach/tablesorter/jquery.tablesorter.min.js'); ?>"></script>
<?php endif ?>
<?php if($jqueryV2) : ?>
<script type="text/javascript" src="<?php echo base_url('vendor/jquery/jqueryV2/jquery-2.2.4.min.js'); ?>"></script>
<script type="text/javascript" src="<?php echo base_url('vendor/jquery/jquery2/jquery-2.2.4.min.js'); ?>"></script>
<?php endif ?>
<?php if($jqueryui) : ?>
@@ -117,3 +117,4 @@ if($jqueryV1 && $jqueryV2) show_error("Two JQuery versions used: composer and in
<?php endif ?>
</head>
composer.json
+14 -19
View File
@@ -29,7 +29,7 @@
{
"type": "package",
"package": {
"name": "alvaro-prieto/colResizable",
"name": "alvaro-prieto/colresizable",
"version": "1.6",
"dist": {
"url": "https://github.com/alvaro-prieto/colResizable/archive/1.6.zip",
@@ -40,7 +40,7 @@
{
"type": "package",
"package": {
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
"name": "blackrockdigital/startbootstrap-sb-admin-2",
"version": "3.3.7.1",
"dist": {
"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v3.3.7+1.zip",
@@ -118,7 +118,7 @@
{
"type": "package",
"package": {
"name": "jquery/jqueryV1",
"name": "jquery/jquery1",
"version": "1.12.4",
"dist": {
"type": "file",
@@ -129,7 +129,7 @@
{
"type": "package",
"package": {
"name": "jquery/jqueryV2",
"name": "jquery/jquery2",
"version": "2.2.4",
"dist": {
"type": "file",
@@ -240,7 +240,7 @@
{
"type": "package",
"package": {
"name": "scottjehl/Respond",
"name": "scottjehl/respond",
"version": "1.4.2",
"dist": {
"url": "https://github.com/scottjehl/Respond/archive/1.4.2.zip",
@@ -251,7 +251,7 @@
{
"type": "package",
"package": {
"name": "tapmodo/Jcrop",
"name": "tapmodo/jcrop",
"version": "2.0.4",
"dist": {
"url": "https://github.com/tapmodo/Jcrop/archive/v2.0.4.zip",
@@ -284,7 +284,7 @@
{
"type": "package",
"package": {
"name": "tomazdragar/SimpleCropper",
"name": "tomazdragar/simplecropper",
"version": "1.0",
"source": {
"url": "https://github.com/tomazdragar/SimpleCropper.git",
@@ -368,22 +368,17 @@
"vuejs/vuejs3": "3.2.33",
"zetacomponents/workflow": "1.*",
"zetacomponents/document": "1.*",
"zetacomponents/workflow-database-tiein": "1.*",
"zetacomponents/workflow-event-log-tiein": "1.*",
"alvaro-prieto/colresizable": "1.6",
"alvaro-prieto/colResizable": "1.6",
"BlackrockDigital/startbootstrap-sb-admin-2": "3.3.*",
"blackrockdigital/startbootstrap-sb-admin-2": "3.3.*",
"borgar/textile-js": "2.0.4",
"fgelinas/timepicker": "0.3.3",
"joeldbirch/superfish": "1.7.*",
"jquery/jqueryV1": "1.*",
"jquery/jqueryV2": "2.*",
"jquery/jquery1": "1.*",
"jquery/jquery2": "2.*",
"jquery/sizzle": "1.0.*",
"jquery-archive/jquery-metadata": "1.0.*",
"json-forms": "1.4.0",
@@ -400,10 +395,10 @@
"rmariuzzo/jquery-checkboxes": "1.0.7",
"scottjehl/Respond": "1.4.2",
"scottjehl/respond": "1.4.2",
"tapmodo/Jcrop": "2.0.4",
"tomazdragar/SimpleCropper": "1.0"
"tapmodo/jcrop": "2.0.4",
"tomazdragar/simplecropper": "1.0"
},
"config": {
"bin-dir": "vendor/bin"
composer.lock
Generated
+24 -410
View File
@@ -4,20 +4,9 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"hash": "f35123d066def191c9f17dbbc4e78807",
"content-hash": "ddcd02108923c9169e0d3bcb3de85d70",
"hash": "b676b82ae026f2aab04de7e7054038a3",
"content-hash": "6f7d38a748ab2c18b1121ee5dd24aa05",
"packages": [
{
"name": "BlackrockDigital/startbootstrap-sb-admin-2",
"version": "3.3.7.1",
"dist": {
"type": "zip",
"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v3.3.7+1.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "afarkas/html5shiv",
"version": "3.7.3",
@@ -50,7 +39,7 @@
"time": "2015-07-20 20:04:00"
},
{
"name": "alvaro-prieto/colResizable",
"name": "alvaro-prieto/colresizable",
"version": "1.6",
"dist": {
"type": "zip",
@@ -60,6 +49,17 @@
},
"type": "library"
},
{
"name": "blackrockdigital/startbootstrap-sb-admin-2",
"version": "3.3.7.1",
"dist": {
"type": "zip",
"url": "https://github.com/BlackrockDigital/startbootstrap-sb-admin-2/archive/v3.3.7+1.zip",
"reference": null,
"shasum": null
},
"type": "library"
},
{
"name": "borgar/textile-js",
"version": "2.0.4",
@@ -908,7 +908,7 @@
"type": "library"
},
{
"name": "jquery/jqueryV1",
"name": "jquery/jquery1",
"version": "1.12.4",
"dist": {
"type": "file",
@@ -919,7 +919,7 @@
"type": "library"
},
{
"name": "jquery/jqueryV2",
"name": "jquery/jquery2",
"version": "2.2.4",
"dist": {
"type": "file",
@@ -1521,7 +1521,7 @@
"type": "library"
},
{
"name": "scottjehl/Respond",
"name": "scottjehl/respond",
"version": "1.4.2",
"dist": {
"type": "zip",
@@ -1594,7 +1594,7 @@
"time": "2020-10-23 09:01:57"
},
{
"name": "tapmodo/Jcrop",
"name": "tapmodo/jcrop",
"version": "2.0.4",
"dist": {
"type": "zip",
@@ -1627,7 +1627,7 @@
"type": "library"
},
{
"name": "tomazdragar/SimpleCropper",
"name": "tomazdragar/simplecropper",
"version": "1.0",
"source": {
"type": "git",
@@ -1732,392 +1732,6 @@
"shasum": null
},
"type": "library"
},
{
"name": "zetacomponents/base",
"version": "1.9.3",
"source": {
"type": "git",
"url": "https://github.com/zetacomponents/Base.git",
"reference": "2f432f4117a5aa2164d4fb1784f84db91dbdd3b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zetacomponents/Base/zipball/2f432f4117a5aa2164d4fb1784f84db91dbdd3b8",
"reference": "2f432f4117a5aa2164d4fb1784f84db91dbdd3b8",
"shasum": ""
},
"require-dev": {
"phpunit/phpunit": "~8.0",
"zetacomponents/unit-test": "*"
},
"type": "library",
"autoload": {
"classmap": [
"src"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Sergey Alexeev"
},
{
"name": "Sebastian Bergmann"
},
{
"name": "Jan Borsodi"
},
{
"name": "Raymond Bosman"
},
{
"name": "Frederik Holljen"
},
{
"name": "Kore Nordmann"
},
{
"name": "Derick Rethans"
},
{
"name": "Vadym Savchuk"
},
{
"name": "Tobias Schlitt"
},
{
"name": "Alexandru Stanoi"
}
],
"description": "The Base package provides the basic infrastructure that all packages rely on. Therefore every component relies on this package.",
"homepage": "https://github.com/zetacomponents",
"time": "2021-07-25 15:46:08"
},
{
"name": "zetacomponents/database",
"version": "1.5.2",
"source": {
"type": "git",
"url": "https://github.com/zetacomponents/Database.git",
"reference": "85a2fd2af4e49f64d5c7616b6fb82c1b88de53b4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zetacomponents/Database/zipball/85a2fd2af4e49f64d5c7616b6fb82c1b88de53b4",
"reference": "85a2fd2af4e49f64d5c7616b6fb82c1b88de53b4",
"shasum": ""
},
"require": {
"zetacomponents/base": "~1.8"
},
"require-dev": {
"phpunit/phpunit": "~8.0",
"zetacomponents/database-schema": "~1.5",
"zetacomponents/unit-test": "*"
},
"type": "library",
"autoload": {
"classmap": [
"src"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Sergey Alexeev"
},
{
"name": "Sebastian Bergmann"
},
{
"name": "Jan Borsodi"
},
{
"name": "Raymond Bosman"
},
{
"name": "Frederik Holljen"
},
{
"name": "Kore Nordmann"
},
{
"name": "Derick Rethans"
},
{
"name": "Vadym Savchuk"
},
{
"name": "Tobias Schlitt"
},
{
"name": "Alexandru Stanoi"
},
{
"name": "Joel Arvidsson"
},
{
"name": "Friedel Hill"
},
{
"name": "Christian Michel"
}
],
"description": "A lightweight database layer on top of PHP's PDO that allows you to utilize a database without having to take care of differences in SQL dialects.",
"homepage": "https://github.com/zetacomponents",
"time": "2022-02-11 17:18:33"
},
{
"name": "zetacomponents/document",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/zetacomponents/Document.git",
"reference": "196884f00871ea7dcbca9ab8bc85716f626e9cc3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zetacomponents/Document/zipball/196884f00871ea7dcbca9ab8bc85716f626e9cc3",
"reference": "196884f00871ea7dcbca9ab8bc85716f626e9cc3",
"shasum": ""
},
"require": {
"zetacomponents/base": "~1.8"
},
"require-dev": {
"phpunit/phpunit": "~8.0",
"zetacomponents/unit-test": "*"
},
"type": "library",
"autoload": {
"classmap": [
"src"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Sebastian Bergmann"
},
{
"name": "Kore Nordmann"
},
{
"name": "Derick Rethans"
},
{
"name": "Tobias Schlitt"
},
{
"name": "Alexandru Stanoi"
}
],
"description": "The Document components provides a general conversion framework for different semantic document markup languages like XHTML, Docbook, RST and similar.",
"homepage": "https://github.com/zetacomponents",
"time": "2022-02-11 17:26:31"
},
{
"name": "zetacomponents/workflow",
"version": "1.5",
"source": {
"type": "git",
"url": "https://github.com/zetacomponents/Workflow.git",
"reference": "44744003c131acc35ee3275a568fbfcb215c3bc8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zetacomponents/Workflow/zipball/44744003c131acc35ee3275a568fbfcb215c3bc8",
"reference": "44744003c131acc35ee3275a568fbfcb215c3bc8",
"shasum": ""
},
"require": {
"zetacomponents/base": "~1.8"
},
"require-dev": {
"zetacomponents/unit-test": "*"
},
"type": "library",
"autoload": {
"classmap": [
"src"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Sergey Alexeev"
},
{
"name": "Sebastian Bergmann"
},
{
"name": "Jan Borsodi"
},
{
"name": "Raymond Bosman"
},
{
"name": "Frederik Holljen"
},
{
"name": "Kore Nordmann"
},
{
"name": "Derick Rethans"
},
{
"name": "Vadym Savchuk"
},
{
"name": "Tobias Schlitt"
},
{
"name": "Alexandru Stanoi"
}
],
"description": "The purpose of the Workflow component is to provide the core functionality of an activity-based workflow system including the definition and execution of workflow specifications.",
"homepage": "https://github.com/zetacomponents",
"time": "2014-09-27 19:26:10"
},
{
"name": "zetacomponents/workflow-database-tiein",
"version": "1.5",
"source": {
"type": "git",
"url": "https://github.com/zetacomponents/WorkflowDatabaseTiein.git",
"reference": "953af80e8e642b41839275f11ff0301a2a267fde"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zetacomponents/WorkflowDatabaseTiein/zipball/953af80e8e642b41839275f11ff0301a2a267fde",
"reference": "953af80e8e642b41839275f11ff0301a2a267fde",
"shasum": ""
},
"require": {
"zetacomponents/database": "~1.4",
"zetacomponents/workflow": "~1.4"
},
"require-dev": {
"zetacomponents/unit-test": "*"
},
"type": "library",
"autoload": {
"classmap": [
"src"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"Apache-2.0"
],
"authors": [
{
"name": "Sergey Alexeev"
},
{
"name": "Sebastian Bergmann"
},
{
"name": "Jan Borsodi"
},
{
"name": "Raymond Bosman"
},
{
"name": "Frederik Holljen"
},
{
"name": "Kore Nordmann"
},
{
"name": "Derick Rethans"
},
{
"name": "Vadym Savchuk"
},
{
"name": "Tobias Schlitt"
},
{
"name": "Alexandru Stanoi"
}
],
"description": "Contains the database backend for the Workflow component.",
"homepage": "https://github.com/zetacomponents",
"time": "2014-09-27 19:26:10"
},
{
"name": "zetacomponents/workflow-event-log-tiein",
"version": "1.1",
"source": {
"type": "git",
"url": "https://github.com/zetacomponents/WorkflowEventLogTiein.git",
"reference": "3e157156d1d5aaac6fadaee86c9b884c18a2b86f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zetacomponents/WorkflowEventLogTiein/zipball/3e157156d1d5aaac6fadaee86c9b884c18a2b86f",
"reference": "3e157156d1d5aaac6fadaee86c9b884c18a2b86f",
"shasum": ""
},
"type": "library",
"autoload": {
"classmap": [
"src"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"apache2"
],
"authors": [
{
"name": "Sergey Alexeev"
},
{
"name": "Sebastian Bergmann"
},
{
"name": "Jan Borsodi"
},
{
"name": "Raymond Bosman"
},
{
"name": "Frederik Holljen"
},
{
"name": "Kore Nordmann"
},
{
"name": "Derick Rethans"
},
{
"name": "Vadym Savchuk"
},
{
"name": "Tobias Schlitt"
},
{
"name": "Alexandru Stanoi"
}
],
"description": "Contains the EventLog listener for the Workflow component.",
"homepage": "https://github.com/zetacomponents",
"time": "2007-12-17 09:04:44"
}
],
"packages-dev": [
@@ -2223,16 +1837,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.13.2",
"version": "v4.14.0",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "210577fe3cf7badcc5814d99455df46564f3c077"
"reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
"reference": "210577fe3cf7badcc5814d99455df46564f3c077",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
"reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
"shasum": ""
},
"require": {
@@ -2271,7 +1885,7 @@
"parser",
"php"
],
"time": "2021-11-30 19:35:32"
"time": "2022-05-31 20:59:12"
},
{
"name": "pdepend/pdepend",