mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Merge branch 'support/3.2' into develop
This commit is contained in:
2
node_modules/.package-lock.json
generated
vendored
2
node_modules/.package-lock.json
generated
vendored
@@ -71,7 +71,7 @@
|
||||
},
|
||||
"node_modules/ckeditor5-itop-build": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
|
||||
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#303d2091805b12fce8807019f599b0a9601c9cfa",
|
||||
"license": "SEE LICENSE IN LICENSE.md"
|
||||
},
|
||||
"node_modules/clipboard": {
|
||||
|
||||
2
node_modules/ckeditor5-itop-build/build/ckeditor.js
generated
vendored
2
node_modules/ckeditor5-itop-build/build/ckeditor.js
generated
vendored
File diff suppressed because one or more lines are too long
2
node_modules/ckeditor5-itop-build/build/ckeditor.js.map
generated
vendored
2
node_modules/ckeditor5-itop-build/build/ckeditor.js.map
generated
vendored
File diff suppressed because one or more lines are too long
6
package-lock.json
generated
6
package-lock.json
generated
@@ -104,7 +104,7 @@
|
||||
},
|
||||
"node_modules/ckeditor5-itop-build": {
|
||||
"version": "3.2.0",
|
||||
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
|
||||
"resolved": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#303d2091805b12fce8807019f599b0a9601c9cfa",
|
||||
"license": "SEE LICENSE IN LICENSE.md"
|
||||
},
|
||||
"node_modules/clipboard": {
|
||||
@@ -357,8 +357,8 @@
|
||||
}
|
||||
},
|
||||
"ckeditor5-itop-build": {
|
||||
"version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#deab849bf05e66948c5e66a57079ad1baea66b94",
|
||||
"from": "ckeditor5-itop-build@github:Combodo/ckeditor5-itop-build"
|
||||
"version": "git+ssh://git@github.com/Combodo/ckeditor5-itop-build.git#303d2091805b12fce8807019f599b0a9601c9cfa",
|
||||
"from": "ckeditor5-itop-build@https://github.com/Combodo/ckeditor5-itop-build.git"
|
||||
},
|
||||
"clipboard": {
|
||||
"version": "2.0.11",
|
||||
|
||||
@@ -73,12 +73,20 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
|
||||
$aModifiedFiles[] = $sCustomDatamodelFile;
|
||||
}
|
||||
}
|
||||
if (count($aModifiedFiles) > 0) {
|
||||
echo "The following files have been modified after the last compilation:\n";
|
||||
foreach ($aModifiedFiles as $sFile) {
|
||||
echo " - $sFile\n";
|
||||
// Keep only xml files
|
||||
$aFilesToCompile = [];
|
||||
foreach ($aModifiedFiles as $sModifiedFile) {
|
||||
if (utils::EndsWith($sModifiedFile, '.xml')) {
|
||||
$aFilesToCompile[] = $sModifiedFile;
|
||||
}
|
||||
}
|
||||
}
|
||||
$aModifiedFiles = $aFilesToCompile;
|
||||
if (count($aModifiedFiles) > 0) {
|
||||
echo "The following files have been modified after the last compilation:\n";
|
||||
foreach ($aModifiedFiles as $sFile) {
|
||||
echo " - $sFile\n";
|
||||
}
|
||||
}
|
||||
return (count($aModifiedFiles) === 0);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user