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
b494ff2ce6
N°4488 Remove cmdbAbstractObject methods used in export.php from API methods and add comment in export.php
...
`@deprecated` was added in 03e9bcd4
2022-02-11 16:15:35 +01:00
Molkobain
01b94f42fe
Fix object's actions menu cannot be open (regression from 0d26211d)
2022-02-11 15:00:44 +01:00
acognet
03e9bcd47a
N°4488 - deprecate cmdbAbstractObject::GetSetAsHTMLSpreadsheet() used only by the old export.php
2022-02-10 15:04:59 +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
0d26211dbe
Fix error in object details : "Too few arguments to function MenuBlock::GetRenderContent()"
2022-02-08 15:16:57 +01:00
Pierre Goiffon
3b99006159
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/integration/iTopModulesPhpVersionChecklistTest.php
2022-02-08 14:49:08 +01:00
Pierre Goiffon
299ad7e753
N°4714 Fix \utils::GetCoreVersionWikiSyntax throwing Exception when 2nd version digit is "0" (for example in 3.0.1)
2022-02-08 14:48:02 +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
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
Pierre Goiffon
17612f88d3
N°4714 utils version method refactoring
...
- removes utils::GetItopPatchVersion and GetItopMinorVersion : unused and badly named :/
- GetItopVersionWikiSyntax now uses core version constant
- iTopModulesPhpVersionIntegrationTest::testiTopModulesPhpVersion now uses ITOP_CORE_VERSION constant
2022-02-01 15:24:56 +01:00
Pierre Goiffon
fcfcf85e0d
N°4714 fix constant version usages in utils methods
2022-02-01 11:39:57 +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
Pierre Goiffon
75dbad7406
N°3129 PHP 8.0 compat: Fix "Deprecated: Required parameter ... follows optional parameter ..."
...
* \SQLObjectQuery::PrepareSingleTable
* \HistoryBlock::GetRenderContent
* \MenuBlock::GetRenderContent
* \UILinksWidgetDirect::DisplayAsBlock
* \UILinksWidgetDirect::Display
* \UILinksWidgetDirect::DisplayEditInPlace
* \UIExtKeyWidget::AutoComplete
* \UIExtKeyWidget::DisplayFromAttCode
2022-01-28 17:01:07 +01:00
acognet
c95064b76d
N°4433 - Fix "date_format" TWIG filter not working for date without time
2022-01-28 14:52:44 +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
acognet
b89d181125
N°4634 - Missing class icone in predefined search
2022-01-27 14:47:24 +01:00
Eric Espie
b58df7150f
N°4634 - Fix typo
2022-01-26 14:43:30 +01:00
acognet
3b4ba2aafd
N°4634 - Missing class icone in predefined search
2022-01-26 12:51:39 +01:00
Benjamin Dalsass
9ef5fd70c0
Merge remote-tracking branch 'origin/develop' into develop
2022-01-26 08:12:13 +01:00
Benjamin Dalsass
3b599a40f3
N°4454 - Measuring the use of the queryphrase book (code review 2)
2022-01-26 08:11:16 +01:00
Molkobain
d89dc1aa4d
N°3824 - History: Remove deprecated APIs from 2.7 and older
2022-01-21 18:10:12 +01:00
acognet
ffb3edced5
N°4668 - Remove all deprecated function from iTopExtensions - ajax_page
2022-01-21 15:20:25 +01:00
acognet
910638d93f
N°4667 - Remove call to tooltip function
2022-01-21 11:51:59 +01:00
acognet
4fdf8803a5
Remove deprecied function $oField->Render replaced by $oField->RenderExpression()
2022-01-21 11:51:56 +01:00
Benjamin Dalsass
1fac2ae787
N°4454 - Measuring the use of the queryphrase book (code review)
2022-01-19 07:48:03 +01:00
Molkobain
ff7d1f2d6a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-01-17 19:21:52 +01:00
Benjamin Dalsass
91d4da85e1
N°4454 - Measuring the use of the queryphrase book
2022-01-14 11:12:30 +01:00
annProg
041a938fc0
🐛 fix notice log when upload svg image
2022-01-14 10:24:37 +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
Molkobain
64afa07ff5
Unit tests: Fix themes compilation test
2022-01-12 15:14:05 +01:00
acognet
11b812b5fc
N°4564 - Tooltip for switching from standard dashboard to custo dashboard not refreshed
2022-01-06 15:09:48 +01:00
Thomas Casteleyn
ce01dad875
utils::GetImageSize can be simplified since minimal PHP version is 7.1.3
2022-01-05 10:15:41 +01:00
Pierre Goiffon
9ca106d889
N°4621 Fix criterionconversionabstract.class.inc.php requires
2021-12-31 16:01:29 +01:00
Pierre Goiffon
5f575d524a
N°4621 Fix naming inconsistencies in sources/*
2021-12-31 15:44:59 +01:00
acognet
16142bd979
Change version number to 3.1.0
2021-12-23 17:23:24 +01:00
Molkobain
9bfa60d272
N°4556 - Remove double icon on pop-up for 1-n links
2021-12-15 11:17:33 +01:00
Molkobain
3e51d010d2
N°4555 - Restore ability to kill concurrent lock
2021-12-15 11:15:40 +01:00
acognet
cde2f333b4
N°4543 - Restore API to add dictionary entries in the backoffice pages
2021-12-14 13:24:30 +01:00
acognet
427ec288ef
N°4544 - Fix PopupMenuItem API not including item's JS / CSS files
2021-12-14 13:23:26 +01:00
Stephen Abello
4511883baf
N°4481 Fix created elements on 1-n disappearing when table is redrawn
2021-12-13 17:01:18 +01:00
Stephen Abello
1e6a4621ea
N°4481 Fix badly escaped dialog tooltip
2021-12-13 17:01:18 +01:00
Molkobain
4d37e2267f
N°4481 - Fix n:n link addition when there are more than 3+ ext. keys on the link class
2021-12-13 15:01:23 +01:00
Molkobain
bd753d65a4
Hierarchical dialog: Put validation button on the right to match convention
2021-12-10 15:05:09 +01:00
Molkobain
0ed2388cf8
Rename "refresh action" param of datatables to match conventions
2021-12-10 14:55:51 +01:00
Pierre Goiffon
02b09c2535
Merge remote-tracking branch 'origin/support/2.6' into support/2.7
2021-12-10 13:38:42 +01:00
Pierre Goiffon
10cfb373f2
N°4481 Fix badly escaped dialog tooltip
...
Was commited to develop first (99a0e0c54f27f3ac
2021-12-10 13:38:24 +01:00
