Pierre Goiffon
ee7fb15fc2
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-02-14 08:44:12 +01:00
Pierre Goiffon
6a5840ed82
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# lib/composer/installed.php
# setup/licenses/community-licenses.xml
# setup/setuputils.class.inc.php
# sources/application/TwigBase/Controller/Controller.php
2022-02-14 08:41:33 +01:00
Molkobain
4a67819f87
N°4714 - Revert rename of utils::GetItopVersionWikiSyntax as it is used in cached packages in the ITSM Designer
2022-02-11 20:00:39 +01:00
Pierre Goiffon
4caf52f1ae
🔥 N°4781 Remove SetupUtils::Log
2022-02-11 16:48:24 +01:00
Pierre Goiffon
0c5b845c8a
📄 N°4770 Update license file
2022-02-11 16:23:54 +01:00
Pierre Goiffon
25c3704990
N°4761 Fix license.xml content not displayed in setup with multi modules extensions ( #261 )
...
For example :
module "mymodule" is in extension "myextension"
On the file system the `license.xml` file will be in `/extensions/myextension/mymodule/license.mymodule.xml`
This form wasn't working in the setup but well displayed in the about box.
When \SetupUtils::GetLicenses was called in the setup it was searching with a GLOB pattern only in one level subfolders. Now we are searching 2 levels.
When called from the console, it is only searching in env-*, where everything is on one level.
2022-02-08 17:28:47 +01:00
Pierre Goiffon
d437e2d662
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/displayblock.class.inc.php
# core/config.class.inc.php
# datamodels/2.x/authent-cas/module.authent-cas.php
# datamodels/2.x/authent-external/module.authent-external.php
# datamodels/2.x/authent-ldap/module.authent-ldap.php
# datamodels/2.x/authent-local/module.authent-local.php
# datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
# datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
# datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
# datamodels/2.x/itop-config/module.itop-config.php
# datamodels/2.x/itop-core-update/module.itop-core-update.php
# datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
# datamodels/2.x/itop-faq-light/module.itop-faq-light.php
# datamodels/2.x/itop-files-information/module.itop-files-information.php
# datamodels/2.x/itop-full-itil/module.itop-full-itil.php
# datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/module.itop-portal-base.php
# datamodels/2.x/itop-portal/module.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
# datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
# datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
# datamodels/2.x/itop-structure/module.itop-structure.php
# datamodels/2.x/itop-tickets/module.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
# datamodels/2.x/version.xml
2022-02-08 15:43:20 +01:00
Pierre Goiffon
b360514646
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/displayblock.class.inc.php
# application/ui.extkeywidget.class.inc.php
# application/utils.inc.php
# approot.inc.php
# core/config.class.inc.php
# css/css-variables.scss
# datamodels/2.x/authent-cas/module.authent-cas.php
# datamodels/2.x/authent-external/module.authent-external.php
# datamodels/2.x/authent-ldap/module.authent-ldap.php
# datamodels/2.x/authent-local/module.authent-local.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
# datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
# datamodels/2.x/itop-config/module.itop-config.php
# datamodels/2.x/itop-core-update/module.itop-core-update.php
# datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
# datamodels/2.x/itop-files-information/module.itop-files-information.php
# datamodels/2.x/itop-full-itil/module.itop-full-itil.php
# datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/module.itop-portal-base.php
# datamodels/2.x/itop-portal/module.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
# datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
# datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/module.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
# datamodels/2.x/version.xml
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# setup/modelfactory.class.inc.php
# setup/setuputils.class.inc.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
2022-02-08 13:18:50 +01:00
Molkobain
15087ab848
N°592 - Fix ModelFactory::GetField() always failing as $aLoadedClasses is never filled
2022-02-02 19:06:38 +01:00
Molkobain
60c372f535
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-02-02 11:20:58 +01:00
Pierre Goiffon
b4fc647845
N°4714 Rename \utils::GetItopVersionWikiSyntax to GetCoreVersionWikiSyntax
...
Will avoid confusion between core or product version !
2022-02-01 15:40:43 +01:00
Eric Espie
81cf3df5e2
Migrate default theme test-red
2022-01-31 17:35:26 +01:00
Pierre Goiffon
45b5c39af7
N°3129 PHP 8.0 compat : code review modifications
...
Many thanks @Molkobain & @Hipska !
2022-01-31 16:41:35 +01:00
Eric Espie
ce87bf9e23
N°4569 - Fix bad alteration on trashed nodes
2022-01-31 16:23:01 +01:00
Pierre Goiffon
ebc9fa684a
N°3129 PHP 8.0 compat: Fix "Private methods cannot be final as they are never overridden by other classes"
...
Was breaking setup ajax compilation
Fixed in:
* \SetupUtils::Log
* \MetaModel::SetUniquenessRuleRootClass
2022-01-28 17:01:07 +01:00
Pierre Goiffon
606bdc1909
N°3129 PHP 8.0 compat: Fix "Access level to MFElement::ReplaceWith() must be public (as in class DOMElement)"
2022-01-28 17:01:07 +01:00
Eric Espie
b9ea7d4913
N°4569 - Fix collision between existing nodes and saved ones
2022-01-27 17:42:52 +01:00
Molkobain
22f9d16743
N°4415 - Remove SetupPage:log*
2022-01-27 17:37:14 +01:00
Molkobain
3d3d94e837
N°2522 - API : Deprecate SetupPage:log*
2022-01-27 17:23:12 +01:00
Molkobain
3bec96abe1
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
# setup/itopdesignformat.class.inc.php
2022-01-27 16:09:22 +01:00
Pierre Goiffon
64e8aa5fee
N°4714 New ITOP_CORE_VERSION constant
...
See following constants PHPDoc for information :
* core/config.class.inc.php ITOP_VERSION
* core/config.class.inc.php ITOP_CORE_VERSION
* setup/itopdesignformat.class.inc.php ITOP_DESIGN_LATEST_VERSION
2022-01-26 15:19:29 +01:00
Eric Espie
1cd230a543
N°4569 - Fix module XML migration during setup (fix _delta and list ids)
2022-01-26 14:39:47 +01:00
Eric Espie
fc47e031b6
N°4569 - Fix module XML migration during setup
2022-01-26 14:03:44 +01:00
Eric Espie
468de06fe1
N°4569 - Fix deletion of light-grey theme for iTop 2.7 and older
2022-01-26 10:00:48 +01:00
acognet
17e8c53236
demove deprecated functions : replace ajax_page by AjaxPage
2022-01-21 11:52:02 +01:00
Molkobain
ff7d1f2d6a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-01-17 19:21:52 +01:00
Stephen Abello
4180a41f27
N°4652 Better error message when XML node define fails from delta ( #256 )
...
N°4652 Add more details when trying to define an already existing XML node
Co-authored-by: Molkobain <guillaume.lajarige@combodo.com >
Co-authored-by: Pierre Goiffon <pierre.goiffon@combodo.com >
2022-01-14 10:20:46 +01:00
Stephen Abello
8ada56fc53
N°4652 Better error message when XML node define fails from delta ( #256 )
...
N°4652 Add more details when trying to define an already existing XML node
Co-authored-by: Molkobain <guillaume.lajarige@combodo.com >
Co-authored-by: Pierre Goiffon <pierre.goiffon@combodo.com >
2022-01-14 10:18:02 +01:00
Pierre Goiffon
135ddbf37d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/phpunit.xml.dist
2022-01-13 13:36:09 +01:00
Molkobain
812606db78
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/config.class.inc.php
2022-01-12 15:54:18 +01:00
Pierre Goiffon
426f275c03
💡 Add additional phpdoc to \DBBackup::GetMysqlCliTlsOptions
2022-01-12 11:21:21 +01:00
Pierre Goiffon
b55ba2ac7f
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/cmdbsource.class.inc.php
# core/log.class.inc.php
# test/setup/iTopDesignFormat/iTopDesignFormatTest.php
2022-01-12 09:56:16 +01:00
Pierre Goiffon
0ee6c60e94
✅ Fix DBBackupTest (again :/)
...
Was working on Windows but not on Linux...
2022-01-12 09:12:04 +01:00
Pierre Goiffon
a663e9fded
✅ Fix DBBackupTest
...
DB connection dependency was added in a222ead4b11bf308🥳
2022-01-12 09:00:26 +01:00
Pierre Goiffon
b3bf516b20
💡 Fix PHPDoc for \DBBackup::GetMysqlCliTlsOptions
2022-01-12 08:24:28 +01:00
Pierre Goiffon
8578d18e7f
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/displayablegraph.class.inc.php
# core/log.class.inc.php
# datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
# datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
# datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# pages/UI.php
# setup/itopdesignformat.class.inc.php
# test/core/LogAPITest.php
# test/integration/iTopModulesPhpVersionChecklistTest.php
# test/postbuild_integration/SetupCssIntegrityChecklistTest.php
# test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
# test/status/StatusTest.php
2022-01-10 16:15:00 +01:00
Pierre Goiffon
b073e4385c
💡 Document versions constants ( #255 )
...
Clarify ITOP_VERSION and ITOP_DESIGN_LATEST_VERSION uses
2022-01-06 14:49:34 +01:00
acognet
cc2efe432e
Change version number to 3.1.0
2021-12-23 16:37:32 +01:00
acognet
b23dac591e
Update license for 3.0
2021-12-09 11:57:33 +01:00
Pierre Goiffon
c89c47d671
Fix mkdir race condition
...
See https://github.com/kalessil/phpinspectionsea/blob/master/docs/probable-bugs.md#mkdir-race-condition
2021-12-07 17:01:05 +01:00
Pierre Goiffon
0c7eee7f9c
💡 Add doc for why phpinfo ext is mandatory
2021-11-24 12:01:44 +01:00
Pierre Goiffon
67fa156c0e
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# application/dashboard.class.inc.php
# core/action.class.inc.php
# datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
# datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
# datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
# datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
# datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
# datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
# datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
# datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
# synchro/synchro_import.php
2021-11-19 10:28:46 +01:00
Pierre Goiffon
500bd15843
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
2021-11-18 08:54:32 +01:00
Pierre Goiffon
3e8dd2f4a5
N°4286 Setup : fix loop in first steps
...
Setup token wasn't removed at the right place :/
2021-11-18 08:54:10 +01:00
Pierre Goiffon
d0fade9ce1
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
...
# Conflicts:
# pages/ajax.render.php
# setup/wizardsteps.class.inc.php
2021-11-17 17:39:36 +01:00
Pierre Goiffon
066b71686d
N°4286 Setup : restore backup download on WizStepDone
...
Setup token was put with N°2016 (6b5cc7c43daa2ef
2021-11-17 14:39:44 +01:00
acognet
60a17c9a65
N°4406 - Warning: Missing constant ITOP_DESIGN_LATEST_VERSION
2021-11-09 15:20:42 +01:00
vdumas
6d0b979bcd
N°3735 revert one part of the previous commit done by mistake
2021-11-04 17:58:49 +01:00
vdumas
a1a38ca224
N°3735 Add missing translation for older methods
2021-11-04 17:10:17 +01:00
odain
e03eb1e279
N°3556: fix broken ci temporarly for test using ItopDataTestCase
2021-10-28 11:48:14 +02:00
