Molkobain
86e1f165cd
Merge remote-tracking branch 'origin/develop' into feature/4517-from-dev
...
# Conflicts:
# CONTRIBUTING.md
# composer.lock
# core/designdocument.class.inc.php
# lib/composer/installed.json
# lib/composer/installed.php
2022-07-28 10:30:25 +02:00
Molkobain
76062ca8b2
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-07-26 22:32:22 +02:00
Molkobain
a80cfb6b05
N°5302 - Code cleanup
2022-07-26 22:18:21 +02:00
Molkobain
6ee67a2a36
N°5108 - Fix variable name
2022-07-26 22:11:38 +02:00
Eric Espie
e91e53c0ec
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.lock
# datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
2022-07-11 17:24:06 +02:00
Eric Espie
01ee91d003
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
...
* migration to iTop 3.0
2022-07-11 15:20:47 +02:00
bdalsass
33054d306d
N°5302 - Replace deprecated php strlen usages ( #308 )
2022-07-08 10:27:52 +02:00
Stephen Abello
65c6e99a3f
Fix typo/useless comment
2022-07-07 09:16:11 +02:00
acognet
7ec12f1e12
N°4517 - PHP 8.1: Replace htmlentities(***, ENT_QUOTES, 'UTF-8') with utils::EscapeHtml
2022-07-01 09:22:25 +02:00
Eric Espie
682ab44dea
Merge branch 'develop' into feature/faf_event_service
2022-06-30 14:22:52 +02:00
acognet
0b2510f6cc
N°4517 - PHP 8.1: Fix htmlentities
2022-06-29 09:17:25 +02:00
Molkobain
7dc4a2776b
N°4517 - PHP 8.1: Fix deprecated notice for null value passed to string parameter of native PHP functions
2022-06-28 16:34:35 +02:00
Pierre Goiffon
130b4b176f
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.lock
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
2022-06-28 16:00:54 +02:00
acognet
682f20bbba
N°5108 - Update embedded libs for PHP 8.0 (3.0 branch)
2022-06-28 11:24:47 +02:00
Pierre Goiffon
784e553d23
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# composer.lock
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
2022-06-28 11:10:01 +02:00
acognet
93a69cbc49
N°5108 - Update embedded libs for PHP 8.0 (3.0 branch)
2022-06-27 23:38:58 +02:00
Eric Espie
b827c68187
Merge branch 'develop' into feature/faf_event_service
2022-05-25 10:04:54 +02:00
Pierre Goiffon
3d541b2a2d
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
2022-05-24 11:29:12 +02:00
Pierre Goiffon
f0d1c3ac60
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/utils.inc.php
# core/htmlsanitizer.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# pages/UI.php
# test/OQL/DataLocalizerTest.php
# test/OQL/OQLToSQLAllClassesTest.php
# test/OQL/OQLToSQLGroupByTest.php
# test/OQL/OQLToSQLNestedSelectTest.php
# test/OQL/OQLToSQLTest.php
# test/application/UtilsTest.php
2022-05-24 11:13:28 +02:00
Molkobain
80e7313b24
PHPDoc
2022-05-19 17:40:14 +02:00
Benjamin Dalsass
5f0a820b4a
N°4899 - add sanitizer url since annotation and tests for sanitizer function
2022-05-19 08:36:42 +02:00
Molkobain
4eb43cd02d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 19:29:57 +02:00
Benjamin Dalsass
03ef4246bf
N°4899 - add sanitizer url since annotation and tests for sanitizer function
2022-05-18 12:03:07 +02:00
Benjamin Dalsass
5574eabfed
N°4899 Adjust url sanitizer for 3.0 compliance
2022-05-18 10:49:23 +02:00
Molkobain
6a332ca60b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 10:43:22 +02:00
Benjamin Dalsass
87f606f768
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/dashlet.class.inc.php
# pages/ajax.render.php
# pages/csvimport.php
# test/phpunit.xml.dist
2022-05-18 10:38:50 +02:00
Molkobain
46713236c4
PHPDoc - Add corresponding link thanks to @pirGoif
2022-05-17 15:34:58 +02:00
Benjamin Dalsass
8e97279401
N°4899 - Reflected XSS on revert_dashboard operation
2022-05-17 09:27:06 +02:00
Molkobain
020937d4f6
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-16 16:22:53 +02:00
Molkobain
ff58fb8617
N°5172 - Add internal helpers to keep usage of null value in native PHP methods: strlen() => utils::StrLen()
2022-05-16 16:15:18 +02:00
Eric Espie
f6d92a189b
CRUD reentrance protection
2022-04-05 10:28:12 +02:00
Molkobain
5854c199d0
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-07 12:54:13 +01:00
Molkobain
cd7f9e478f
N°4913 - Avoid object initials to overflow in medallions
2022-03-06 22:44:12 +01:00
Eric Espie
4bdf84bf6c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-03 10:23:38 +01:00
Pierre Goiffon
2b1e583dc7
💡 N°4854 Document compiler behavior change for model.*.php files
2022-03-02 10:06:59 +01:00
Pierre Goiffon
3081aa473a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# setup/runtimeenv.class.inc.php
2022-03-02 09:49:59 +01:00
Pierre Goiffon
809ea2eb49
💡 N°4854 Add phpdoc to utils::*Module* methods
2022-03-02 09:42:09 +01:00
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
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
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
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
Thomas Casteleyn
ce01dad875
utils::GetImageSize can be simplified since minimal PHP version is 7.1.3
2022-01-05 10:15:41 +01:00
Molkobain
4409162eb7
N°2875 - Fix mentions not working with some non url encoded "markers" (eg. '#')
2021-11-14 22:53:10 +01:00
Stephen Abello
ab1b6837a2
N°3800 Fix line spacing in rich text editor and in its displayed content
2021-10-26 15:26:29 +02:00