From 0f6d5e8ddff9e5a12127e883e45446880f8781be Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 06:13:35 +0000 Subject: [PATCH 01/11] fix release script --- Helper/Scripts/release.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Helper/Scripts/release.sh b/Helper/Scripts/release.sh index 78d32a3..809d079 100644 --- a/Helper/Scripts/release.sh +++ b/Helper/Scripts/release.sh @@ -25,9 +25,9 @@ echo "#################################################" echo "# Update develop main repo" echo "#################################################" -git git add . -git git commit -m "Preparing for master update" -git git push +git add . +git commit -m "Preparing for master update" +git push echo "#################################################" echo "# Switch to master" @@ -44,15 +44,15 @@ echo "# Merge develop" echo "#################################################" git submodule foreach git merge develop -git git merge develop +git merge develop git submodule foreach git add . git submodule foreach "git commit -m 'Update master' || true" git submodule foreach git push -git git add . -git git commit -m "Update master" -git git push +git add . +git commit -m "Update master" +git push echo "#################################################" echo "# Switch to develop" From 74bae0e8813143f1b0adfcd17e97cb9712519836 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 07:21:20 +0000 Subject: [PATCH 02/11] update version requirement --- Helper/Php/createPhpFromJsonDb.php | 6 +++--- Helper/Php/findMissingAdminTest.php | 2 +- Helper/Php/findMissingApiFunctions.php | 2 +- Helper/Php/findMissingInvalidApiControllerTest.php | 2 +- Helper/Php/findMissingNullModelTest.php | 4 ++-- Helper/Php/langUsageInspector.php | 2 +- Helper/Php/reconcileTestReportElements.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Helper/Php/createPhpFromJsonDb.php b/Helper/Php/createPhpFromJsonDb.php index 0d69ee6..eb20b3b 100644 --- a/Helper/Php/createPhpFromJsonDb.php +++ b/Helper/Php/createPhpFromJsonDb.php @@ -11,7 +11,7 @@ $mapper = <<< MAPPER /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package {$namespace} * @copyright Dennis Eichhorn @@ -84,7 +84,7 @@ $model = <<< MODEL /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package {$namespace} * @copyright Dennis Eichhorn @@ -136,7 +136,7 @@ $nullmodel = <<< NULLMODEL /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package {$namespace} * @copyright Dennis Eichhorn diff --git a/Helper/Php/findMissingAdminTest.php b/Helper/Php/findMissingAdminTest.php index ee6f90a..0f89779 100644 --- a/Helper/Php/findMissingAdminTest.php +++ b/Helper/Php/findMissingAdminTest.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Helper * @copyright Dennis Eichhorn diff --git a/Helper/Php/findMissingApiFunctions.php b/Helper/Php/findMissingApiFunctions.php index 04ee75b..878c5f4 100644 --- a/Helper/Php/findMissingApiFunctions.php +++ b/Helper/Php/findMissingApiFunctions.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Helper * @copyright Dennis Eichhorn diff --git a/Helper/Php/findMissingInvalidApiControllerTest.php b/Helper/Php/findMissingInvalidApiControllerTest.php index c70de70..62b04e2 100644 --- a/Helper/Php/findMissingInvalidApiControllerTest.php +++ b/Helper/Php/findMissingInvalidApiControllerTest.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Helper * @copyright Dennis Eichhorn diff --git a/Helper/Php/findMissingNullModelTest.php b/Helper/Php/findMissingNullModelTest.php index 9d0aaa6..b1858a7 100644 --- a/Helper/Php/findMissingNullModelTest.php +++ b/Helper/Php/findMissingNullModelTest.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Helper * @copyright Dennis Eichhorn @@ -59,7 +59,7 @@ foreach ($modules as $module) { . '/**' . "\n" . ' * Jingga' . "\n" . ' *' . "\n" - . ' * PHP Version 8.1' . "\n" + . ' * PHP Version 8.2' . "\n" . ' *' . "\n" . ' * @package tests' . "\n" . ' * @copyright Dennis Eichhorn' . "\n" diff --git a/Helper/Php/langUsageInspector.php b/Helper/Php/langUsageInspector.php index 956e216..3ab95e1 100644 --- a/Helper/Php/langUsageInspector.php +++ b/Helper/Php/langUsageInspector.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * Inspect .lang.php files and check them for errors/optimization * diff --git a/Helper/Php/reconcileTestReportElements.php b/Helper/Php/reconcileTestReportElements.php index 254b6a7..48df562 100644 --- a/Helper/Php/reconcileTestReportElements.php +++ b/Helper/Php/reconcileTestReportElements.php @@ -2,7 +2,7 @@ /** * Jingga * - * PHP Version 8.1 + * PHP Version 8.2 * * @package Helper * @copyright Dennis Eichhorn From 0f34cfbdba2c675939563257d7bbae3d5dc7b4a1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 07:24:18 +0000 Subject: [PATCH 03/11] update php version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 20a119a..9f1be61 100755 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The last feature is the backend and documentation generation based on the DocBlo The build system will take care of most requirements, the following tools and commands have to be available on the system. - software-properties-common npm git php8.1 php8.1-dev php8.1-cli php8.1-common php8.1-mysql php8.1-pgsql php8.1-xdebug php8.1-opcache php8.1-pdo php8.1-sqlite php8.1-mbstring php8.1-curl php8.1-imap php8.1-bcmath php8.1-zip php8.1-dom php8.1-xml php8.1-phar php8.1-gd php-pear apache2 mysql-server postgresql postgresql-contrib vsftpd tesseract-ocr wget curl grep xarg sed composer + software-properties-common npm git php8.2 php8.2-dev php8.2-cli php8.2-common php8.2-mysql php8.2-pgsql php8.2-xdebug php8.2-opcache php8.2-pdo php8.2-sqlite php8.2-mbstring php8.2-curl php8.2-imap php8.2-bcmath php8.2-zip php8.2-dom php8.2-xml php8.2-phar php8.2-gd php-pear apache2 mysql-server postgresql postgresql-contrib vsftpd tesseract-ocr wget curl grep xarg sed composer ## Inspections From ec2a37fac9267ba8852fb140e42eccd9299e50ed Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 20 Mar 2024 08:02:38 +0000 Subject: [PATCH 04/11] fix ICLA name --- ICAL.txt => ICLA.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ICAL.txt => ICLA.txt (100%) mode change 100755 => 100644 diff --git a/ICAL.txt b/ICLA.txt old mode 100755 new mode 100644 similarity index 100% rename from ICAL.txt rename to ICLA.txt From c2c5f5b6102e7d11fbdf632d3ed8a61ad80ed21d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 22 Mar 2024 22:31:11 +0000 Subject: [PATCH 05/11] update --- Backup/cron.sh | 2 +- Backup/local.sh | 32 +++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Backup/cron.sh b/Backup/cron.sh index d28c64b..fe5bc46 100644 --- a/Backup/cron.sh +++ b/Backup/cron.sh @@ -6,7 +6,7 @@ MAIN_PATH="/var/www/html/jingga/" # 0 4 * * * /var/www/html/jingga/Build/Backup/cron.sh # Create backup -${MAIN_PATH}Build/Backup/backup.sh > /tmp/backup.log +${MAIN_PATH}Build/Backup/local.sh > /tmp/backup.log # Mail log files ${MAIN_PATH}Build/Backup/mail.sh ${MAIL_PASSWORD} /tmp/backup.log diff --git a/Backup/local.sh b/Backup/local.sh index 26088e7..fd08a9e 100644 --- a/Backup/local.sh +++ b/Backup/local.sh @@ -22,17 +22,21 @@ sql_exit=$? # Create file backup -BACKUP_PATH="/mnt/d/backup" +BACKUP_PATH="/mnt/d/backup/backup.borg" TO_BACKUP="/var/www/html" -REMOTE_USER="user" -REMOTE_SERVER="192.168.178.38" -REMOTE_PORT="2022" +#REMOTE_USER="user" +#REMOTE_SERVER="192.168.178.38" +#REMOTE_PORT="2022" # Setting this, so the repo does not need to be given on the commandline: -export BORG_REPO=ssh://${REMOTE_USER}@${REMOTE_SERVER}:${REMOTE_PORT}${BACKUP_PATH} +#export BORG_REPO=ssh://${REMOTE_USER}@${REMOTE_SERVER}:${REMOTE_PORT}${BACKUP_PATH} # See the section "Passphrase notes" for more infos. -export BORG_PASSPHRASE='sorden' +export BORG_PASSPHRASE='password' + +# Global settings +export BORG_RELOCATED_REPO_ACCESS_IS_OK=no +export BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK=no ## Create repository # borg init -v --encryption=repokey ${BACKUP_PATH} @@ -47,12 +51,14 @@ borg create \ --list \ --stats \ --show-rc \ + --one-file-system \ --compression lz4 \ + --checkpoint-interval 86400 \ --exclude-caches \ --exclude 'home/*/.cache/*' \ --exclude 'var/tmp/*' \ \ - ::'{hostname}-{utcnow}' \ + ${BACKUP_PATH}::${TIMESTAMP}-$$-www \ ${TO_BACKUP} backup_exit=$? @@ -78,17 +84,25 @@ borg compact ${BACKUP_PATH} compact_exit=$? +## Check integrity +info "Checking repository" + +borg check --verify-data ${BACKUP_PATH} + +check_exit=$? + # Handle global exit code global_exit=$(( sql_exit > backup_exit ? sql_exit : backup_exit )) global_exit=$(( prune_exit > global_exit ? prune_exit : global_exit )) global_exit=$(( compact_exit > global_exit ? compact_exit : global_exit )) +global_exit=$(( check_exit > global_exit ? check_exit : global_exit )) if [ ${global_exit} -eq 0 ]; then info "Backup finished successfully" elif [ ${global_exit} -eq 1 ]; then - info "Backup, Prune, and/or Compact finished with warnings" + info "Backup, Prune, Compact and/or Check finished with warnings" else - info "Backup, Prune, and/or Compact finished with errors" + info "Backup, Prune, Compact and/or Check finished with errors" fi exit ${global_exit} From 46b6a68177739d6e1391e41e764c42d3f36164ac Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 29 Mar 2024 15:25:59 +0000 Subject: [PATCH 06/11] started with template fixes --- Backup/local.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Backup/local.sh b/Backup/local.sh index fd08a9e..32e445a 100644 --- a/Backup/local.sh +++ b/Backup/local.sh @@ -57,22 +57,22 @@ borg create \ --exclude-caches \ --exclude 'home/*/.cache/*' \ --exclude 'var/tmp/*' \ + --exclude '*.log' \ \ ${BACKUP_PATH}::${TIMESTAMP}-$$-www \ ${TO_BACKUP} backup_exit=$? -## Only keep 7 daily, 4 weekly and 6 monthly backups +## Only keep 1 daily, 0 weekly and 3 monthly backups info "Pruning repository" borg prune \ --list \ --glob-archives '{hostname}-*' \ --show-rc \ - --keep-daily 7 \ - --keep-weekly 4 \ - --keep-monthly 6 \ + --keep-daily 1 \ + --keep-monthly 3 \ --keep-yearly 10 prune_exit=$? From aef139596fa45151b1102e960a851754d54b117d Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 12 Apr 2024 00:52:05 +0000 Subject: [PATCH 07/11] fix bugs --- Js/build.sh | 10 ---------- Js/build3D.sh | 0 Js/buildBase.sh | 0 Js/buildChart.sh | 27 --------------------------- Js/buildLib.sh | 11 ----------- Js/buildMath.sh | 10 ---------- Js/buildSocket.sh | 0 Js/buildUI.sh | 0 8 files changed, 58 deletions(-) delete mode 100755 Js/build.sh delete mode 100755 Js/build3D.sh delete mode 100755 Js/buildBase.sh delete mode 100755 Js/buildChart.sh delete mode 100755 Js/buildLib.sh delete mode 100755 Js/buildMath.sh delete mode 100755 Js/buildSocket.sh delete mode 100755 Js/buildUI.sh diff --git a/Js/build.sh b/Js/build.sh deleted file mode 100755 index c4b7e52..0000000 --- a/Js/build.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -. config.sh - -. ${BUILD_PATH}/Js/buildBase.sh -. ${BUILD_PATH}/Js/buildLib.sh -. ${BUILD_PATH}/Js/buildUI.sh -. ${BUILD_PATH}/Js/build3D.sh -. ${BUILD_PATH}/Js/buildChart.sh -. ${BUILD_PATH}/Js/buildSocket.sh \ No newline at end of file diff --git a/Js/build3D.sh b/Js/build3D.sh deleted file mode 100755 index e69de29..0000000 diff --git a/Js/buildBase.sh b/Js/buildBase.sh deleted file mode 100755 index e69de29..0000000 diff --git a/Js/buildChart.sh b/Js/buildChart.sh deleted file mode 100755 index 30fa1c9..0000000 --- a/Js/buildChart.sh +++ /dev/null @@ -1,27 +0,0 @@ -# JS files -SRC=0 -SRC[0]="${ROOT_PATH}/jsOMS/Chart/ChartAbstract.js" -SRC[1]="${ROOT_PATH}/jsOMS/Chart/LineChart.js" -SRC[2]="${ROOT_PATH}/jsOMS/Chart/AreaChart.js" -SRC[3]="${ROOT_PATH}/jsOMS/Chart/DiffAreaChart.js" -SRC[4]="${ROOT_PATH}/jsOMS/Chart/StackedAreaChart.js" -SRC[5]="${ROOT_PATH}/jsOMS/Chart/ColumnChart.js" -SRC[6]="${ROOT_PATH}/jsOMS/Chart/BarChart.js" -SRC[7]="${ROOT_PATH}/jsOMS/Chart/GroupedColumnChart.js" -SRC[8]="${ROOT_PATH}/jsOMS/Chart/GroupedBarChart.js" -SRC[9]="${ROOT_PATH}/jsOMS/Chart/StackedColumnChart.js" -SRC[10]="${ROOT_PATH}/jsOMS/Chart/StackedBarChart.js" -SRC[11]="${ROOT_PATH}/jsOMS/Chart/PieChart.js" -SRC[12]="${ROOT_PATH}/jsOMS/Chart/DonutChart.js" -SRC[13]="${ROOT_PATH}/jsOMS/Chart/WaterfallChart.js" -SRC[14]="${ROOT_PATH}/jsOMS/Chart/VWaterfallChart.js" -SRC[15]="${ROOT_PATH}/jsOMS/Chart/PyramidChart.js" -SRC[16]="${ROOT_PATH}/jsOMS/Chart/ScatterplotChart.js" -SRC[17]="${ROOT_PATH}/jsOMS/Chart/CalendarChart.js" -SRC[18]="${ROOT_PATH}/jsOMS/Chart/CandlestickChart.js" -SRC[19]="${ROOT_PATH}/jsOMS/Chart/OhlcChart.js" - -# JS files -OUT="${ROOT_PATH}/jsOMS/omsChart.js" - -. Tools/jsBuilder.sh diff --git a/Js/buildLib.sh b/Js/buildLib.sh deleted file mode 100755 index 74736f7..0000000 --- a/Js/buildLib.sh +++ /dev/null @@ -1,11 +0,0 @@ -# JS files -SRC=0 -SRC[0]="${ROOT_PATH}/jsOMS/Utils/Dom.js" -SRC[1]="${ROOT_PATH}/jsOMS/Utils/StringUtils.js" -SRC[2]="${ROOT_PATH}/jsOMS/Utils/ArrayUtils.js" -SRC[3]="${ROOT_PATH}/jsOMS/Utils/Misc.js" - -# JS files -OUT="${ROOT_PATH}/jsOMS/omsLib.js" - -. Tools/jsBuilder.sh diff --git a/Js/buildMath.sh b/Js/buildMath.sh deleted file mode 100755 index 4c943b0..0000000 --- a/Js/buildMath.sh +++ /dev/null @@ -1,10 +0,0 @@ -# JS files -SRC=0 -SRC[0]="${ROOT_PATH}/jsOMS/Math/Functions.js" -SRC[1]="${ROOT_PATH}/jsOMS/Math/Matrix.js" -SRC[2]="${ROOT_PATH}/jsOMS/Math/Evaluation.js" - -# JS files -OUT="${ROOT_PATH}/jsOMS/omsMath.js" - -. Tools/jsBuilder.sh diff --git a/Js/buildSocket.sh b/Js/buildSocket.sh deleted file mode 100755 index e69de29..0000000 diff --git a/Js/buildUI.sh b/Js/buildUI.sh deleted file mode 100755 index e69de29..0000000 From d7c2cfb41cb4d2f07d36f76ff96ebb57ef488bcd Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 19 Apr 2024 02:08:37 +0000 Subject: [PATCH 08/11] general fixes --- Helper/Scripts/screenshots.js | 644 ++++++++++++++++++++++++++++++++++ 1 file changed, 644 insertions(+) create mode 100644 Helper/Scripts/screenshots.js diff --git a/Helper/Scripts/screenshots.js b/Helper/Scripts/screenshots.js new file mode 100644 index 0000000..b53c8e0 --- /dev/null +++ b/Helper/Scripts/screenshots.js @@ -0,0 +1,644 @@ +const {By,Key,Builder} = require("selenium-webdriver"); +const chrome = require('selenium-webdriver/chrome'); +const http = require('http'); +let fs = require('fs'); +let path = require('path'); + +const base = 'http://192.168.178.38'; +const language = 'en'; +const src = [ + 'legal/privacy', + 'legal/terms', + 'legal/imprint', + 'forgot', + 'admin/module/settings', + 'admin/account/list', + 'admin/account/settings', + 'admin/account/create', + 'admin/group/list', + 'admin/group/settings', + 'admin/group/create', + 'admin/module/list', + 'admin/module/info', + 'admin/module/log', + 'admin/module/route/list', + 'admin/module/hook/list', + 'admin/audit/list', + 'admin/audit/view', + 'admin/audit/view?id=1', + 'admin/audit/view?id=9999', + 'organization/organigram', + 'organization/unit/list', + 'organization/unit/view', + 'organization/unit/view?id=1', + 'organization/unit/view?id=9999', + 'organization/unit/create', + 'organization/department/list', + 'organization/department/view', + 'organization/department/view?id=1', + 'organization/department/view?id=9999', + 'organization/department/create', + 'organization/position/list', + 'organization/position/view', + 'organization/position/view?id=1', + 'organization/position/view?id=9999', + 'organization/position/create', + 'help/general', + 'help/module/list', + 'help/module/view', + 'help/module/view?id=1', + 'help/module/view?id=9999', + 'help/developer', + 'tag/create', + 'tag/list', + 'tag/view', + 'tag/view?id=1', + 'tag/view?id=9999', + 'admin/module/settings?id=Media', + 'media/list', + 'media/upload', + 'media/file/create', + 'media/collection/create', + 'media/view', + 'media/view?id=1', + 'media/view?id=9999', + 'profile/list', + 'profile/view', + 'profile/view?id=1', + 'profile/view?id=9999', + 'admin/module/settings/view/create', + 'admin/module/settings?id=Navigation', + 'admin/module/navigation/list', + 'cms/application/list', + 'cms/application/page/list', + 'cms/application/page', + 'cms/application/post/list', + 'cms/application/files', + 'cms/application/create', + 'admin/monitoring/general', + 'admin/monitoring/stats', + 'admin/monitoring/log/list', + 'admin/monitoring/log/view', + 'admin/monitoring/log/view?id=1', + 'admin/monitoring/log/view?id=9999', + 'helper/template/create', + 'helper/report/create', + 'helper/list', + 'helper/report/view', + 'helper/report/view?id=1', + 'helper/report/view?id=9999', + 'search', + 'calendar/dashboard', + 'editor/create', + 'editor/list', + 'editor/view', + 'editor/view?id=1', + 'editor/view?id=9999', + 'editor/edit', + 'notification/dashboard', + 'task/dashboard', + 'task/list', + 'task/view', + 'task/view?id=1', + 'task/view?id=9999', + 'task/create', + 'task/analysis', + 'messages/dashboard', + 'messages/template/list', + 'messages/template/view', + 'messages/template/view?id=1', + 'messages/template/view?id=9999', + 'checklist/list', + 'checklist/view', + 'checklist/view?id=1', + 'checklist/view?id=9999', + 'checklist/template/list', + 'checklist/template/create', + 'checklist/template/view', + 'checklist/template/view?id=1', + 'checklist/template/view?id=9999', + 'checklist/template/task/view', + 'checklist/template/task/view?id=1', + 'checklist/template/task/view?id=9999', + 'checklist/template/task/create', + 'news/dashboard', + 'news/article', + 'news/archive', + 'news/draft/list', + 'news/create', + 'news/edit', + 'kanban', + 'kanban/dashboard', + 'kanban/archive', + 'kanban/board', + 'kanban/card/view', + 'kanban/card/view?id=1', + 'kanban/card/view?id=9999', + 'kanban/card/create', + 'kanban/create', + 'kanban/edit', + 'admin/module/settings?id=QA', + 'qa/dashboard', + 'qa/question/view', + 'qa/question/view?id=1', + 'qa/question/view?id=9999', + 'qa/question/create', + 'qa/app/list', + 'qa/app/view', + 'qa/app/view?id=1', + 'qa/app/view?id=9999', + 'qa/app/create', + 'workflow/template/list', + 'workflow/template/view', + 'workflow/template/view?id=1', + 'workflow/template/view?id=9999', + 'workflow/template/create', + 'workflow/instance/list', + 'workflow/instance/view', + 'workflow/instance/view?id=1', + 'workflow/instance/view?id=9999', + 'humanresource/staff/list', + 'humanresource/staff/view', + 'humanresource/staff/view?id=1', + 'humanresource/staff/view?id=9999', + 'humanresource/staff/create', + 'humanresource/department/list', + 'humanresource/department/view', + 'humanresource/department/view?id=1', + 'humanresource/department/view?id=9999', + 'humanresource/position/list', + 'humanresource/position/view', + 'humanresource/position/view?id=1', + 'humanresource/position/view?id=9999', + 'humanresource/timerecording/dashboard', + 'private/timerecording/dashboard', + 'private/timerecording/session', + 'contract/list', + 'contract/view', + 'contract/view?id=1', + 'contract/view?id=9999', + 'contract/create', + 'contract/type/list', + 'contract/type/view', + 'contract/type/view?id=1', + 'contract/type/view?id=9999', + 'contract/type/create', + 'contract/attribute/type/list', + 'contract/attribute/type/view', + 'contract/attribute/type/view?id=1', + 'contract/attribute/type/view?id=9999', + 'contract/attribute/type/create', + 'contract/attribute/value/view', + 'contract/attribute/value/view?id=1', + 'contract/attribute/value/view?id=9999', + 'contract/attribute/value/create', + 'support/list', + 'support/ticket/view', + 'support/ticket/view?id=1', + 'support/ticket/view?id=9999', + 'support/create', + 'support/analysis/dashboard', + 'support/settings', + 'sales/client/attribute/type/list', + 'sales/client/attribute/type/view', + 'sales/client/attribute/type/view?id=1', + 'sales/client/attribute/type/view?id=9999', + 'sales/client/attribute/type/create', + 'sales/client/attribute/value/view', + 'sales/client/attribute/value/view?id=1', + 'sales/client/attribute/value/view?id=9999', + 'sales/client/attribute/value/create', + 'sales/client/list', + 'sales/client/create', + 'sales/client/view', + 'sales/client/view?id=1', + 'sales/client/view?id=9999', + 'sales/client/analysis', + 'accounting/entry/dashboard', + 'accounting/entry/list', + 'accounting/entry/view', + 'accounting/entry/view?id=1', + 'accounting/entry/view?id=9999', + 'accounting/entry/create', + 'accounting/entry/archive', + 'accounting/entry/template/list', + 'accounting/coa/view', + 'accounting/coa/view?id=1', + 'accounting/coa/view?id=9999', + 'accounting/coa/list', + 'accounting/coa/create', + 'accounting/costcenter/list', + 'accounting/costobject/list', + 'accounting/costcenter/view', + 'accounting/costcenter/view?id=1', + 'accounting/costcenter/view?id=9999', + 'accounting/costcenter/create', + 'accounting/costobject/view', + 'accounting/costobject/view?id=1', + 'accounting/costobject/view?id=9999', + 'accounting/costobject/create', + 'accounting/supplier/list', + 'accounting/client/list', + 'accounting/supplier/view', + 'accounting/supplier/view?id=1', + 'accounting/supplier/view?id=9999', + 'accounting/client/view', + 'accounting/client/view?id=1', + 'accounting/client/view?id=9999', + 'item/attribute/type/list', + 'item/attribute/type/view', + 'item/attribute/type/view?id=1', + 'item/attribute/type/view?id=9999', + 'item/attribute/type/create', + 'item/attribute/value/view', + 'item/attribute/value/view?id=1', + 'item/attribute/value/view?id=9999', + 'item/attribute/value/create', + 'item/list', + 'item/create', + 'item/view', + 'item/view?id=1', + 'item/view?id=9999', + 'sales/item/list', + 'sales/item/view', + 'sales/item/view?id=1', + 'sales/item/view?id=9999', + 'purchase/item/list', + 'purchase/item/view', + 'purchase/item/view?id=1', + 'purchase/item/view?id=9999', + 'warehouse/item/list', + 'warehouse/item/view', + 'warehouse/item/view?id=1', + 'warehouse/item/view?id=9999', + 'purchase/analysis/item', + 'production/item/list', + 'production/item/view', + 'production/item/view?id=1', + 'production/item/view?id=9999', + 'item/material/list', + 'item/material/view', + 'item/material/view?id=1', + 'item/material/view?id=9999', + 'item/material/create', + 'purchase/supplier/attribute/type/list', + 'purchase/supplier/attribute/type/view', + 'purchase/supplier/attribute/type/view?id=1', + 'purchase/supplier/attribute/type/view?id=9999', + 'purchase/supplier/attribute/type/create', + 'purchase/supplier/attribute/value/view', + 'purchase/supplier/attribute/value/view?id=1', + 'purchase/supplier/attribute/value/view?id=9999', + 'purchase/supplier/attribute/value/create', + 'purchase/supplier/list', + 'purchase/supplier/create', + 'purchase/supplier/view', + 'purchase/supplier/view?id=1', + 'purchase/supplier/view?id=9999', + 'purchase/analysis/supplier', + 'finance/tax/code/list', + 'finance/tax/code/view', + 'finance/tax/code/view?id=1', + 'finance/tax/code/view?id=9999', + 'finance/tax/code/create', + 'sales/bill/create', + 'sales/bill/list', + 'sales/bill/archive', + 'sales/bill/view', + 'sales/bill/view?id=1', + 'sales/bill/view?id=9999', + 'purchase/bill/create', + 'purchase/bill/list', + 'purchase/bill/archive', + 'purchase/bill/view', + 'purchase/bill/view?id=1', + 'purchase/bill/view?id=9999', + 'purchase/bill/upload', + 'warehouse/bill/create', + 'warehouse/bill/list', + 'warehouse/bill/archive', + 'warehouse/bill/view', + 'warehouse/bill/view?id=1', + 'warehouse/bill/view?id=9999', + 'private/purchase/recognition/dashboard', + 'private/purchase/recognition/upload', + 'private/purchase/recognition/bill', + 'purchase/recognition/dashboard', + 'purchase/recognition/upload', + 'purchase/recognition/bill', + 'bill/payment/list', + 'bill/payment/view', + 'bill/payment/view?id=1', + 'bill/payment/view?id=9999', + 'bill/shipping/list', + 'bill/shipping/view', + 'bill/shipping/view?id=1', + 'bill/shipping/view?id=9999', + 'finance/tax/combination/list', + 'finance/tax/combination/view', + 'finance/tax/combination/view?id=1', + 'finance/tax/combination/view?id=9999', + 'finance/tax/combination/create', + 'purchase/order/suggestion/view', + 'purchase/order/suggestion/view?id=1', + 'purchase/order/suggestion/view?id=9999', + 'purchase/order/suggestion/create', + 'purchase/order/suggestion/list', + 'sales/analysis', + 'sales/analysis/bill', + 'sales/analysis/rep', + 'sales/analysis/region', + 'sales/analysis/client', + 'sales/analysis/item', + 'warehouse/stock/list', + 'warehouse/stock/view', + 'warehouse/stock/view?id=1', + 'warehouse/stock/view?id=9999', + 'warehouse/stock/create', + 'warehouse/stock/type/list', + 'warehouse/stock/type/view', + 'warehouse/stock/type/view?id=1', + 'warehouse/stock/type/view?id=9999', + 'warehouse/stock/type/create', + 'warehouse/stock/location/list', + 'warehouse/stock/location/view', + 'warehouse/stock/location/view?id=1', + 'warehouse/stock/location/view?id=9999', + 'warehouse/stock/location/create', + 'qualitymanagement/report/list', + 'qualitymanagement/report/view', + 'qualitymanagement/report/view?id=1', + 'qualitymanagement/report/view?id=9999', + 'qualitymanagement/report/create', + 'qualitymanagement/audit/list', + 'qualitymanagement/audit/view', + 'qualitymanagement/audit/view?id=1', + 'qualitymanagement/audit/view?id=9999', + 'equipment/attribute/type/list', + 'equipment/attribute/type/view', + 'equipment/attribute/type/view?id=1', + 'equipment/attribute/type/view?id=9999', + 'equipment/attribute/type/create', + 'equipment/attribute/value/view', + 'equipment/attribute/value/view?id=1', + 'equipment/attribute/value/view?id=9999', + 'equipment/attribute/value/create', + 'equipment/list', + 'equipment/create', + 'equipment/view', + 'equipment/view?id=1', + 'equipment/view?id=9999', + 'equipment/inspection/list', + 'equipment/inspection/type/list', + 'equipment/inspection/create', + 'equipment/inspection/view', + 'equipment/inspection/view?id=1', + 'equipment/inspection/view?id=9999', + 'accounting/asset/attribute/type/list', + 'accounting/asset/attribute/type/view', + 'accounting/asset/attribute/type/view?id=1', + 'accounting/asset/attribute/type/view?id=9999', + 'accounting/asset/list', + 'accounting/asset/view', + 'accounting/asset/view?id=1', + 'accounting/asset/view?id=9999', + 'accounting/asset/create', + 'accounting/asset/table', + 'fleet/vehicle/attribute/type/list', + 'fleet/vehicle/attribute/type/view', + 'fleet/vehicle/attribute/type/view?id=1', + 'fleet/vehicle/attribute/type/view?id=9999', + 'fleet/vehicle/attribute/type/create', + 'fleet/vehicle/attribute/value/view', + 'fleet/vehicle/attribute/value/view?id=1', + 'fleet/vehicle/attribute/value/view?id=9999', + 'fleet/vehicle/attribute/value/create', + 'fleet/vehicle/list', + 'fleet/vehicle/create', + 'fleet/vehicle/view', + 'fleet/vehicle/view?id=1', + 'fleet/vehicle/view?id=9999', + 'fleet/driver/attribute/type/list', + 'fleet/driver/attribute/type/view', + 'fleet/driver/attribute/type/view?id=1', + 'fleet/driver/attribute/type/view?id=9999', + 'fleet/driver/attribute/type/create', + 'fleet/driver/attribute/value/view', + 'fleet/driver/attribute/value/view?id=1', + 'fleet/driver/attribute/value/view?id=9999', + 'fleet/driver/attribute/value/create', + 'fleet/driver/list', + 'fleet/driver/create', + 'fleet/driver/view', + 'fleet/driver/view?id=1', + 'fleet/driver/view?id=9999', + 'fleet/inspection/list', + 'fleet/inspection/vehicle/type/list', + 'fleet/inspection/vehicle/create', + 'fleet/inspection/vehicle/view', + 'fleet/inspection/vehicle/view?id=1', + 'fleet/inspection/vehicle/view?id=9999', + 'fleet/inspection/driver/type/list', + 'fleet/inspection/driver/create', + 'fleet/inspection/driver/view', + 'fleet/inspection/driver/view?id=1', + 'fleet/inspection/driver/view?id=9999', + 'wiki', + 'wiki/dashboard', + 'wiki/category/list', + 'wiki/category/view', + 'wiki/category/view?id=1', + 'wiki/category/view?id=9999', + 'wiki/category/create', + 'wiki/doc/view', + 'wiki/doc/view?id=1', + 'wiki/doc/view?id=9999', + 'wiki/doc/create', + 'wiki/doc/edit', + 'wiki/doc/list', + 'wiki/app/list', + 'wiki/app/view', + 'wiki/app/view?id=1', + 'wiki/app/view?id=9999', + 'wiki/app/create', + 'admin/exchange/import/list', + 'admin/exchange/export/list', + 'admin/exchange/import/view', + 'admin/exchange/import/view?id=1', + 'admin/exchange/import/view?id=9999', + 'admin/exchange/export/view', + 'admin/exchange/export/view?id=1', + 'admin/exchange/export/view?id=9999', + 'admin/exchange/log/list', + 'admin/exchange/log', + 'finance/investment/list', + 'finance/investment/view', + 'finance/investment/view?id=1', + 'finance/investment/view?id=9999', + 'finance/investment/option/create', + 'finance/investment/option/view', + 'finance/investment/option/view?id=1', + 'finance/investment/option/view?id=9999', + 'finance/investment/create', + 'private/investment/list', + 'private/investment/create', + 'private/investment/view', + 'private/investment/view?id=1', + 'private/investment/view?id=9999', + 'finance/loan/list', + 'finance/loan/view', + 'finance/loan/view?id=1', + 'finance/loan/view?id=9999', + 'finance/loan/create', + 'finance/loan/table', + 'businessexpenses/expense/list', + 'businessexpenses/expense/create', + 'businessexpenses/expense/view', + 'businessexpenses/expense/view?id=1', + 'businessexpenses/expense/view?id=9999', + 'businessexpenses/expense/element/view', + 'businessexpenses/expense/element/view?id=1', + 'businessexpenses/expense/element/view?id=9999', + 'businessexpenses/expense/element/create', + 'businessexpenses/type/list', + 'businessexpenses/type/view', + 'businessexpenses/type/view?id=1', + 'businessexpenses/type/view?id=9999', + 'businessexpenses/type/create', + 'controlling/balance/dashboard', + 'controlling/pl/dashboard', + 'controlling/budget/dashboard', + 'controlling/budget/pl', + 'controlling/budget/balance', + 'controlling/budget/sales', + 'controlling/budget/material', + 'controlling/budget/opex', + 'controlling/budget/hr', + 'controlling/budget/investment', + 'controlling/budget/loan', + 'controlling/budget/cashflow', + 'controlling/budget/profitcenter', + 'controlling/budget/projects', + 'controlling/budget/marketing', + 'controlling/budget/event', + 'controlling/budget/leasing', + 'warehouse/stocktaking/list', + 'warehouse/stocktaking/overview', + 'warehouse/stocktaking/area', + 'warehouse/stocktaking/entry', + 'warehouse/stocktaking/stats', + 'warehouse/labeling/item/list', + 'warehouse/labeling/item', + 'warehouse/labeling/layout', + 'warehouse/labeling/layout/list', + 'production/list', + 'production/create', + 'production/view', + 'production/view?id=1', + 'production/view?id=9999', + 'production/machine/list', + 'production/machine/create', + 'production/machine/view', + 'production/machine/view?id=1', + 'production/machine/view?id=9999', + 'production/recipe/list', + 'production/recipe/create', + 'production/recipe/view', + 'production/recipe/view?id=1', + 'production/recipe/view?id=9999', + 'orw/resource/list', + 'orw/resource', + 'orw/resource/create', + 'orw/resource/report/list', + 'orw/resource/report', + 'projectmanagement/list', + 'projectmanagement/create', + 'projectmanagement/view', + 'projectmanagement/view?id=1', + 'projectmanagement/view?id=9999', + 'eventmanagement/list', + 'eventmanagement/create', + 'eventmanagement/view', + 'eventmanagement/view?id=1', + 'eventmanagement/view?id=9999', + 'controlling/riskmanagement/cockpit', + 'controlling/riskmanagement/risk/list', + 'controlling/riskmanagement/risk/create', + 'controlling/riskmanagement/risk/view', + 'controlling/riskmanagement/risk/view?id=1', + 'controlling/riskmanagement/risk/view?id=9999', + 'controlling/riskmanagement/cause/list', + 'controlling/riskmanagement/cause/view', + 'controlling/riskmanagement/cause/view?id=1', + 'controlling/riskmanagement/cause/view?id=9999', + 'controlling/riskmanagement/solution/list', + 'controlling/riskmanagement/solution/view', + 'controlling/riskmanagement/solution/view?id=1', + 'controlling/riskmanagement/solution/view?id=9999', + 'controlling/riskmanagement/department/list', + 'controlling/riskmanagement/department/view', + 'controlling/riskmanagement/department/view?id=1', + 'controlling/riskmanagement/department/view?id=9999', + 'controlling/riskmanagement/category/list', + 'controlling/riskmanagement/category/view', + 'controlling/riskmanagement/category/view?id=1', + 'controlling/riskmanagement/category/view?id=9999', + 'controlling/riskmanagement/category/create', + 'controlling/riskmanagement/project/list', + 'controlling/riskmanagement/project/view', + 'controlling/riskmanagement/project/view?id=1', + 'controlling/riskmanagement/project/view?id=9999', + 'controlling/riskmanagement/process/list', + 'controlling/riskmanagement/process/view', + 'controlling/riskmanagement/process/view?id=1', + 'controlling/riskmanagement/process/view?id=9999', + 'controlling/riskmanagement/process/create', + 'controlling/riskmanagement/settings/dashboard', +]; +const length = src.length; + +async function checkEndpoint(driver, url) { + await driver.get(url); + + try { + await driver.findElement(By.xpath('//*[@alt="404 error image"]')); + + return -1; + } catch(error) { + return 0; + } finally { + const data = await driver.takeScreenshot(true); + await fs.writeFileSync('C:/Users/spl1nes/screenshots/' + url.replace(/[^a-z0-9]/gi, '_').toLowerCase() + '.png', data, 'base64'); + } +} + +let dir = path.dirname('C:/Users/spl1nes/screenshots/'); +if (!fs.existsSync(dir)) { + fs.mkdirSync(dir, { recursive: true }); +} + +(async function loop() { + const driver = await new Builder().forBrowser("chrome").build(); + await driver.get(base); + await driver.manage().setTimeouts({ implicit: 3000 }); + await driver.manage().window().setRect({ width: 1920, height: 1080 }); + await driver.findElement(By.id('iLoginButton')).click(); + await driver.sleep(1000); + + let status = 0; + + for (let i = 0; i < length; ++i) { + try { + status = await checkEndpoint(driver, base + '/' + language + '/' + src[i]); + } catch(error) { + console.error(error); + } + + if (status !== 0) { + console.error(status +': ' + src[i]); + status = 0; + } + } + + await driver.quit(); +})(); From b51f71faf9e66ca5aa855b24e464c303937a1757 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 24 Apr 2024 16:23:31 +0000 Subject: [PATCH 09/11] fix tests --- Config/jasmine.json | 10 ++ Config/jasmine_build.sh | 13 ++ Config/snippets.code-snippets | 251 ---------------------------------- 3 files changed, 23 insertions(+), 251 deletions(-) create mode 100644 Config/jasmine.json create mode 100644 Config/jasmine_build.sh delete mode 100755 Config/snippets.code-snippets diff --git a/Config/jasmine.json b/Config/jasmine.json new file mode 100644 index 0000000..c882222 --- /dev/null +++ b/Config/jasmine.json @@ -0,0 +1,10 @@ +{ + "spec_dir": "tests", + "spec_files": [ + "**/*[sS]pec.js" + ], + "helpers": [ + ], + "stopSpecOnExpectationFailure": false, + "random": true + } \ No newline at end of file diff --git a/Config/jasmine_build.sh b/Config/jasmine_build.sh new file mode 100644 index 0000000..226c1c2 --- /dev/null +++ b/Config/jasmine_build.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +SEARCH_DIR="./tests" + +FILES=$(find $SEARCH_DIR -type f -name "*Test.js") + +for FILE in $FILES; do + INPUT_PATH="$FILE" + + OUT_PATH="${INPUT_PATH/Test.js/Spec.js}" + + npx esbuild $INPUT_PATH --bundle --outfile=$OUT_PATH +done diff --git a/Config/snippets.code-snippets b/Config/snippets.code-snippets deleted file mode 100755 index a802ce4..0000000 --- a/Config/snippets.code-snippets +++ /dev/null @@ -1,251 +0,0 @@ -{ - "Api Controller": { - "scope": "php,tpl.php", - "prefix": "apicontroller", - "body": [ - "/**", - " * Karaka", - " *", - " * PHP Version 8.1", - " *", - " * @package Modules\\\\$1", - " * @copyright Dennis Eichhorn", - " * @license OMS License 1.0", - " * @version 1.0.0", - " * @link https://jingga.app", - " */", - "declare(strict_types=1);", - "", - "namespace Modules\\\\$1\\Controller;", - "", - "use phpOMS\\Account\\Account;", - "use phpOMS\\Localization\\ISO639x1Enum;", - "use phpOMS\\Message\\NotificationLevel;", - "use phpOMS\\Message\\RequestAbstract;", - "use phpOMS\\Message\\ResponseAbstract;", - "use phpOMS\\Model\\Message\\FormValidation;", - "use phpOMS\\Utils\\Parser\\Markdown\\Markdown;", - "", - "/**", - " * $1 controller class.", - " *", - " * @package Modules\\\\$1", - " * @license OMS License 1.0", - " * @link https://jingga.app", - " * @since 1.0.0", - " */", - "final class ApiController extends Controller", - "{", - "", - "}", - "" - ], - "description": "Create a api controller" - }, - "Null Model": { - "scope": "php,tpl.php", - "prefix": "nullmodel", - "body": [ - "/**", - " * Karaka", - " *", - " * PHP Version 8.1", - " *", - " * @package Modules\\\\$1", - " * @copyright Dennis Eichhorn", - " * @license OMS License 1.0", - " * @version 1.0.0", - " * @link https://jingga.app", - " */", - "declare(strict_types=1);", - "", - "namespace Modules\\\\$1\\Models;", - "", - "/**", - " * Null model", - " *", - " * @package Modules\\\\$1", - " * @license OMS License 1.0", - " * @link https://jingga.app", - " * @since 1.0.0", - " */", - "class Null$2 extends $2", - "{", - "}", - "" - ], - "description": "Create a Null Model" - }, - "Model": { - "scope": "php,tpl.php", - "prefix": "model", - "body": [ - "/**", - " * Karaka", - " *", - " * PHP Version 8.1", - " *", - " * @package Modules\\\\$1", - " * @copyright Dennis Eichhorn", - " * @license OMS License 1.0", - " * @version 1.0.0", - " * @link https://jingga.app", - " */", - "declare(strict_types=1);", - "", - "namespace Modules\\\\$1\\Models;", - "", - "/**", - " * Null model", - " *", - " * @package Modules\\\\$1", - " * @license OMS License 1.0", - " * @link https://jingga.app", - " * @since 1.0.0", - " */", - "class $2 implements \\JsonSerializable", - "{", - " private \\$id = 0;", - "", - " public function getId() : int", - " {", - " return \\$this->id;", - " }", - "", - " /**", - " * {@inheritdoc}", - " */", - " public function toArray() : array", - " {", - " return [", - " 'id' => \\$this->id,", - " ];", - " }", - "", - " /**", - " * {@inheritdoc}", - " */", - " public function __toString()", - " {", - " return (string) \\json_encode(\\$this->toArray());", - " }", - "", - " /**", - " * {@inheritdoc}", - " */", - " public function jsonSerialize()", - " {", - " eturn \\$this->toArray();", - " }", - "}", - "" - ], - "description": "Create a Model" - }, - "Api Create": { - "scope": "php,tpl.php", - "prefix": "apicreate", - "body": [ - " /**", - " * Api method to create a $1", - " *", - " * @param RequestAbstract \\$request Request", - " * @param ResponseAbstract \\$response Response", - " * @param mixed \\$data Generic data", - " *", - " * @return void", - " *", - " * @api", - " *", - " * @since 1.0.0", - " */", - " public function api$2Create(RequestAbstract \\$request, ResponseAbstract \\$response, \\$data = null) : void", - " {", - " if (!empty(\\$val = \\$this->validate$2Create(\\$request))) {", - " \\$response->set('$1_create', new FormValidation(\\$val));", - "", - " return;", - " }", - "", - " $$1 = \\$this->create$2FromRequest(\\$request);", - " \\$this->createModel(\\$request->header->account, $$1, $2Mapper::class, '$1');", - " \\$this->fillJsonResponse(\\$request, \\$response, NotificationLevel::OK, '$2', '$2 successfully created', $$1);", - " }", - "", - " /**", - " * Validate $1 from account create request", - " *", - " * @param RequestAbstract \\$request Request", - " *", - " * @return array", - " *", - " * @since 1.0.0", - " */", - " private function validate$2Create(RequestAbstract \\$request) : array", - " {", - " $val = [];", - " if ((\\$val['account'] = empty(\\$request->getData('account')))", - " ) {", - " return $val;", - " }", - "", - " return [];", - " }", - "", - " /**", - " * Method to create $1 from request.", - " *", - " * @param RequestAbstract \\$request Request", - " *", - " * @return $2", - " *", - " * @since 1.0.0", - " */", - " private function create$2FromRequest(RequestAbstract \\$request) : $2", - " {", - " $$1 = new $2();", - "", - " return $$1;", - " }", - "" - ], - "description": "Create a model in the api controller" - }, - "Enum Create": { - "scope": "php", - "prefix": "enum", - "body": [ - "/**", - " * Karaka", - " *", - " * PHP Version 8.1", - " *", - " * @package Modules\\\\$1", - " * @copyright Dennis Eichhorn", - " * @license OMS License 1.0", - " * @version 1.0.0", - " * @link https://jingga.app", - " */", - "declare(strict_types=1);", - "", - "namespace Modules\\\\$1\\Models;", - "", - "use phpOMS\\Stdlib\\Base\\Enum;", - "", - "/**", - " * $2 enum.", - " *", - " * @package Modules\\\\$1", - " * @license OMS License 1.0", - " * @link https://jingga.app", - " * @since 1.0.0", - " */", - "abstract class $2 extends Enum", - "{", - " public const OPEN = 1;", - "}", - "" - ], - "description": "Create an enum" - } -} \ No newline at end of file From 6a07de9243ef63a86a9ffe8edda542230b4d7823 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 24 Apr 2024 17:50:19 +0000 Subject: [PATCH 10/11] fix clang-format --- Config/.clang-format | 3 --- 1 file changed, 3 deletions(-) diff --git a/Config/.clang-format b/Config/.clang-format index 6e434f0..2137b98 100755 --- a/Config/.clang-format +++ b/Config/.clang-format @@ -34,7 +34,4 @@ TabWidth: 4 UseTab: Never IndentPPDirectives: BeforeHash IndentCaseLabels: true -BraceWrappingAfterControlStatementStyle: BWACS_MultiLine -BreakBeforeBinaryOperators: BOS_All -AllowShortBlocksOnASingleLine: SBS_Empty AllowShortIfStatementsOnASingleLine: Never \ No newline at end of file From fa3073cc1b5e9ae9c3629b7ec6ce358e9a653919 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 24 Apr 2024 23:37:15 +0000 Subject: [PATCH 11/11] prepare master merge --- Helper/Scripts/release.sh | 12 ++++++------ LICENSE.txt | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Helper/Scripts/release.sh b/Helper/Scripts/release.sh index 809d079..3e5ac5b 100644 --- a/Helper/Scripts/release.sh +++ b/Helper/Scripts/release.sh @@ -5,7 +5,7 @@ echo "# Build develop" echo "#################################################" git submodule foreach "git checkout develop || true" -git submodule foreach git pull +git submodule foreach "git pull || true" git checkout develop git pull @@ -19,7 +19,7 @@ echo "#################################################" git submodule foreach git add . git submodule foreach "git commit -m 'Preparing for master update' || true" -git submodule foreach git push +git submodule foreach "git push || true" echo "#################################################" echo "# Update develop main repo" @@ -33,8 +33,8 @@ echo "#################################################" echo "# Switch to master" echo "#################################################" -git submodule foreach git checkout master -git submodule foreach git pull +git submodule foreach "git checkout master || true" +git submodule foreach "git pull || true" git checkout master git pull @@ -43,12 +43,12 @@ echo "#################################################" echo "# Merge develop" echo "#################################################" -git submodule foreach git merge develop +git submodule foreach "git merge develop || true" git merge develop git submodule foreach git add . git submodule foreach "git commit -m 'Update master' || true" -git submodule foreach git push +git submodule foreach "git push || true" git add . git commit -m "Update master" diff --git a/LICENSE.txt b/LICENSE.txt index 4ba0161..02b1ff5 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -46,3 +46,7 @@ Unless required by applicable law or agreed to in writing, Licensor provides the 7. Limitation of Liability In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. + +8. Future Changes + +The Licensor may change the License for future versions as he sees fit.