Eric Espie
9c37d5c23e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# application/applicationextension.inc.php
# application/cmdbabstract.class.inc.php
# core/dbobject.class.php
# core/kpi.class.inc.php
# core/metamodel.class.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
2023-07-19 09:26:46 +02:00
Eric Espie
6432678de9
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
# application/utils.inc.php
# bootstrap.inc.php
# composer.json
# core/MyHelpers.class.inc.php
# core/cmdbsource.class.inc.php
# core/config.class.inc.php
# core/dbobject.class.php
# core/kpi.class.inc.php
# core/metamodel.class.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2023-07-18 14:36:58 +02:00
Stephen Abello
2b5973ec67
N°6436 - Integrate Performance Audit pre requisite in iTop Pro 2.7.9
2023-07-18 09:15:37 +02:00
Pierre Goiffon
5247f5b3ea
🔖 Prepare version 3.1.1
2023-07-11 09:56:59 +02:00
bdalsass
9d38b4d1d6
N°6043 - Booking: Add prerequisites in iTop core - CRUD extensibility ( #520 )
2023-07-04 16:22:53 +02:00
Molkobain
bd96247f97
N°1345 - Fix typo in conf. param. description
2023-06-12 09:56:57 +02:00
vdumas
01fb3466c8
N°1350 - Audit: propose domains selection as default
2023-06-12 09:22:34 +02:00
Molkobain
508647fe0b
N°1345 - Add possibility to sort transitions automatically
2023-06-09 12:49:42 +02:00
vdumas
380723056a
N°5559 - Obsolete replica locks object edition - fix default param value
2023-05-10 10:24:12 +02:00
Vincent Dumas
5c252849fa
N°5559 - Prevent obsolete replica to lock iTop object ( #376 )
...
* N°5559 prevent obsolete replica to lock iTop object
* N°5559 - new config param for ignoring obsolete replica
* N°5559 - new config param for ignoring obsolete replica (2)
2023-05-09 11:28:44 +02:00
odain
b4f517b03b
Merge branch 'support/3.0' into develop
2023-05-05 15:57:04 +02:00
odain
8c639fc23a
N°5753 - add config parameter allow_rest_services_via_tokens to bypass rest secure profile option
2023-05-05 15:53:32 +02:00
Molkobain
aca46fb1d6
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/ui.linkswidget.class.inc.php
2023-04-20 17:41:40 +02:00
Molkobain
46e869d1f4
N°6124 - Workaround performance problem on the modification of an object with an n:n relation having a large volume
2023-04-20 12:22:12 +02:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
bdalsass
baafb97bdd
N°5993 - Add purge mechanism to log system ( #447 )
...
* N°5993 - Add purge mechanism to log system
* Update core/config.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update core/log.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update core/log.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update core/log.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update core/log.class.inc.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Namespace the log purge config parameters
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-03-06 15:25:26 +01:00
Molkobain
26169111ed
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# css/backoffice/utils/helpers/_misc.scss
2023-02-23 11:05:54 +01:00
Pierre Goiffon
f55fc8d264
N°6014 Validation pattern for URL : now handles commas in params ( #356 )
...
Seen on PRTG URLs
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-02-23 10:59:38 +01:00
vdumas
f7e87c1ea1
N°5347 - Change default value of allow_menu_on_linkset
2023-01-20 11:30:55 +01:00
Lars Kaltefleiter
57ab3a0336
N°1350 - link audit catecories to domains and evaluate only categories of a given domain via interactive audit
2023-01-10 18:20:15 +01:00
Pierre Goiffon
43d86ad8e2
N°2013 Setup : fix crash on setting readonly mode if initial DB info were wrong
...
Same as 15d3201a#351 .
This fix introduces the new method \WizardController::GetParamForConfigArray
I replaced existing duplicate code with a call to this new generic method.
2023-01-10 10:56:21 +01:00
Pierre Goiffon
15d3201a40
N°2013 Setup : fix crash on compilation if initial DB info were wrong
...
Use case :
- having in the iTop config file wrong DB parameters (unreachable server for example)
- launch the setup in update mode
- fix the DB config in the wizard
The PR #351 solved the errors that were happening in the following steps.
But we still had an error during compilation, caused by the maintenance mode activation.
2023-01-09 16:11:27 +01:00
Vincent Dumas
259eb60f97
N°5841 - Non-admin managing User can't see Administrator by default ( #383 )
2023-01-03 14:08:28 +01:00
Eric Espie
c02f84969a
N°4756 - Ease extensibility for CRUD operations : Event Service
2022-12-08 08:21:13 +01:00
Eric Espie
3548251997
Merge branch 'support/3.0' into develop
2022-12-02 09:27:40 +01:00
Eric Espie
4d365c8a44
Merge branch 'support/2.7' into support/3.0
2022-12-02 09:26:40 +01:00
Eric Espie
957ff40f30
N°5155 - Email by SMTP with self-signed certificate (changed default values to the previous behaviour)
2022-12-02 09:25:53 +01:00
Eric Espie
93e0dde1a1
Merge branch 'support/3.0' into develop
...
# Conflicts:
# sources/Core/Email/EmailSwiftMailer.php
Email by SMTP with self-signed certificate ported from EmailSwiftMailer to EmailLaminas
2022-11-30 14:35:13 +01:00
Eric Espie
7bb12c35ea
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# core/config.class.inc.php
2022-11-30 14:27:32 +01:00
Eric Espie
aff9c7748b
N°5155 - Email by SMTP with self-signed certificate
2022-11-30 14:18:11 +01:00
odain
0ef5e9d3ff
N°5620 - Hide the organization filter with a conf parameter
2022-11-22 13:57:42 +01:00
acognet
2eadb632df
N°5618 - Setup : Compatibility PHP 8.1
2022-10-19 09:21:16 +02:00
acognet
1fcb3af4c0
N°5618 - Setup : Compatibility PHP 8.1
2022-10-14 17:09:35 +02:00
Molkobain
e55ac6002a
Increase ITOP_VERSION to 3.0.3-dev
2022-09-20 13:22:18 +02:00
Eric Espie
71464f6d0e
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/cmdbobject.class.inc.php
# core/dbobject.class.php
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-09-19 09:45:08 +02:00
Eric Espie
952bceb3c3
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# core/config.class.inc.php
# core/legacy/dbobjectsearchlegacy.class.php
# core/legacy/querybuildercontextlegacy.class.inc.php
# core/legacy/querybuilderexpressionslegacy.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-08-09 10:49:40 +02:00
Eric Espie
029e6114ad
N°4715 - Remove deprecated legacy SQL build
2022-08-09 10:41:46 +02:00
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
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
e105cc6d44
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.lock
# core/log.class.inc.php
# datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
# lib/composer/autoload_real.php
# setup/licenses/community-licenses.xml
# setup/setuputils.class.inc.php
2022-07-11 09:23:18 +02:00
Eric Espie
1b8e48539d
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Add comment in configuration
2022-07-01 14:32:44 +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
Benjamin Dalsass
02dab4eb72
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
# templates/pages/backoffice/oauth/Wizard.html.twig
2022-06-27 08:38:01 +02:00
Benjamin Dalsass
f0b94dd0f7
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/config.class.inc.php
# datamodels/2.x/installation.xml
# datamodels/2.x/itop-oauth-client/assets/img/icons8-adjust.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-administrative-tools.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-application-window.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-apps-tab.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-archive-folder.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-audit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-automatic.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-bandage.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-book-error.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-calendar.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-cassette.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-approved.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-emergency.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-normal.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change-routine.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-change.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-checkmark.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-cloud-file.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-conflict.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-contract.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-customer.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-database-custom.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-database.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-delete.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-department.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-desktop.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-discussion-forum.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-documents.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electrical.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electricity.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-electronics.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-enclosure-for-servers.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-export-csv.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-faq.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-farm.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-file.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-cable.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-fiber.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-globe-wire.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hdd.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hierarchy.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-hypervisor.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-import-csv.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-important-book.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-in-transit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-laptop.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-licence.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-map-as-drive.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-map-marker.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-mobile.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-music-robot.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-nas.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-network.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-new-item.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-note.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-office-phone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-old-vmware-logo.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-organization.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-person-female.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-phone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-plug-socket.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-power-plant.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-print.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-process-improvement.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-puzzle.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-rack.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server-custom.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server-storage.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-server.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-service.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-services.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-smartphone-tablet.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-instance.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-license.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software-other.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-software.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-solve.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-stack.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-switch-san.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-switch.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-tape-library.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-tasklist.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-team.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-telephone.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-time-limit.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-virtual-machine.svg
# datamodels/2.x/itop-oauth-client/assets/img/icons8-web.svg
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# js/wizardhelper.js
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# templates/pages/backoffice/oauth/Wizard.html.twig
2022-06-27 08:11:28 +02:00
Eric Espie
aa90d5b6ab
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
2022-06-21 13:51:08 +02:00
Eric Espie
6aef59e42d
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/dbobject.class.php
# datamodels/2.x/itop-config/config.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
2022-06-08 16:51:44 +02:00
bdalsass
2b885beb82
Feature/merge 3 0 develop ( #298 )
...
* merging 3.0 into develop
* N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* migration to iTop 3.1
Co-authored-by: Eric Espie <eric.espie@combodo.com >
2022-06-08 16:27:20 +02:00
Benjamin Dalsass
0819b9baba
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.json
# composer.lock
# core/config.class.inc.php
# core/dbobject.class.php
# core/email.class.inc.php
# datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php
# datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml
# datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/cs.dictionary.itop.ui.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.ui.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.ui.php
# dictionaries/en.dictionary.itop.ui.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.ui.php
# dictionaries/fr.dictionary.itop.core.php
# dictionaries/fr.dictionary.itop.ui.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.ui.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.ui.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.ui.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.ui.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.ui.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.ui.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.ui.php
# dictionaries/tr.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.ui.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# sources/application/TwigBase/Controller/Controller.php
# sources/application/TwigBase/Twig/TwigHelper.php
2022-06-02 16:30:48 +02:00
Eric Espie
23c95ebbf3
Block if event is not registered
2022-06-02 13:48:59 +02:00
