Molkobain
0c90b2f1aa
Fix code style
2022-07-28 11:52:28 +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
bdalsass
cd861263fb
Update sources/Application/TwigBase/Twig/Extension.php
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-07-27 08:54:03 +02:00
Benjamin Dalsass
dbd5c32535
restore important security fix on twig filter
...
see N°4867 "Twig content not allowed" error when use the extkey widget search icon in the user portal
2022-07-27 08:54:03 +02:00
Benjamin Dalsass
25a612da04
Update Symfony bundles
2022-07-26 14:36:58 +02:00
Eric Espie
3ae862d690
N°5310 - Mail to ticket: Migration 3.1 - PHPMail
2022-07-12 13:37:02 +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
bdalsass
33054d306d
N°5302 - Replace deprecated php strlen usages ( #308 )
2022-07-08 10:27:52 +02:00
Eric Espie
24d19cd8d6
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Add a flag to select OAuth client for SMTP usage
2022-07-07 16:34:19 +02:00
Eric Espie
f40141072a
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Fix errors on vendor name
2022-07-06 14:10:01 +02:00
Eric Espie
48957fd2f0
N°5102 - Allow to send emails using GSuite SMTP and OAuth - refactor scopes
2022-07-05 17:54:43 +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
Benjamin Dalsass
f5389a2d2d
N°4517 - PHP 8.1 compatibility: Replace strlen with Utils::StrLen to avoid null value issue
2022-06-30 16:18:27 +02:00
Benjamin Dalsass
f13ed9494b
N°4517 - PHP 8.1 compatibility: Replace strlen with Utils::StrLen to avoid null value issue
2022-06-30 15:12:59 +02:00
Eric Espie
682ab44dea
Merge branch 'develop' into feature/faf_event_service
2022-06-30 14:22:52 +02:00
acognet
eb408e2ea4
N°4517 - PHP 8.1: Fix static method in a trait
2022-06-29 09:17:08 +02:00
acognet
958a86bbb5
N°4517 - PHP 8.1: Fix strlen
2022-06-29 09:16:50 +02:00
acognet
b45da1eaa5
N°4517 - PHP 8.1: Fix use of Serializable
2022-06-29 09:16:25 +02:00
Pierre Goiffon
eb8ea0fbd4
Remove Symfony tests dir
2022-06-28 11:14: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
54eb9d081b
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
2022-06-23 12:20:53 +02:00
Eric Espie
9f60f27636
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
2022-06-22 16:41:45 +02:00
Eric Espie
ba59643f52
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Rework
2022-06-21 16:47:46 +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
Benjamin Dalsass
bd3724be8f
symfony 5.4 (twig filter initialization correction)
2022-06-20 08:22:23 +02:00
Benjamin Dalsass
683ab25e83
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-06-17 10:14:01 +02:00
Benjamin Dalsass
4d180eb303
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.lock
# js/wizardhelper.js
# lib/composer/autoload_real.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/guzzlehttp/guzzle/CHANGELOG.md
# setup/wizardsteps.class.inc.php
2022-06-17 09:25:57 +02:00
bdalsass
79da71ecf8
migration symfony 5 4 ( #300 )
...
* symfony 5.4 (diff dev)
* symfony 5.4 (working)
* symfony 5.4 (update autoload)
* symfony 5.4 (remove swiftmailer mailer implementation)
* symfony 5.4 (php doc and split Global accessor class)
### Impacted packages:
composer require php:">=7.2.5 <8.0.0" symfony/console:5.4.* symfony/dotenv:5.4.* symfony/framework-bundle:5.4.* symfony/twig-bundle:5.4.* symfony/yaml:5.4.* --update-with-dependencies
composer require symfony/stopwatch:5.4.* symfony/web-profiler-bundle:5.4.* --dev --update-with-dependencies
2022-06-16 09:13:24 +02:00
Pierre Goiffon
44a8bfd764
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.lock
# core/email.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# lib/bin/generate-deps-for-config-factory
# lib/bin/generate-deps-for-config-factory.bat
# lib/bin/generate-factory-for-class
# lib/bin/generate-factory-for-class.bat
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_psr4.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# lib/composer/installed.json
# lib/composer/installed.php
# lib/laminas/laminas-servicemanager/bin/generate-deps-for-config-factory
# lib/laminas/laminas-servicemanager/bin/generate-factory-for-class
# lib/laminas/laminas-servicemanager/src/AbstractPluginManager.php
# lib/laminas/laminas-servicemanager/src/ServiceManager.php
# lib/laminas/laminas-validator/src/Db/AbstractDb.php
# lib/laminas/laminas-validator/src/Isbn/Isbn10.php
# lib/laminas/laminas-validator/src/Isbn/Isbn13.php
# sources/Core/Email/EmailFactory.php
# templates/pages/backoffice/oauth/Wizard.html.twig
2022-06-14 09:41:45 +02:00
Eric Espie
4099376472
N°5102 - Allow to send emails using GSuite SMTP and OAuth - Defer the deletion (expunge) to the end of connection
2022-06-09 11:40:13 +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
Eric Espie
6d3118d9e9
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth (fix config error message)
2022-06-08 13:24:29 +02:00
Eric Espie
972e894bc5
debug log
2022-06-02 17:32:15 +02:00
Eric Espie
86a2db7e7f
Remove AFTER_DISPLAY_PAGE Event
2022-06-02 17:23:07 +02:00
Eric Espie
4c31081de2
Remove AFTER_DISPLAY_PAGE Event
2022-06-02 17:19:43 +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
f6855b0d2b
Display events in the datamodel page
2022-06-01 08:44:12 +02:00
Eric Espie
93cc29f4d9
refactor
2022-05-31 15:42:09 +02:00
Eric Espie
b827c68187
Merge branch 'develop' into feature/faf_event_service
2022-05-25 10:04:54 +02:00
Eric Espie
622f40c06c
N°3169 - Add feature to connect Gsuite mail box with OAuth
...
N°2504 - Add feature to connect Office mail box with OAuth2 for Microsoft Graph
* Fix legacy mailboxes compatibility
2022-05-25 08:21:16 +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
Eric Espie
754946bf62
N°3169 - Add feature to connect Gsuite mail box with OAuth
...
N°2504 - Add feature to connect Office mail box with OAuth2 for Microsoft Graph
* Fix legacy mailboxes compatibility
2022-05-23 12:09:40 +02:00
Molkobain
6086131d3c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-20 09:36:03 +02:00
Molkobain
227814e6c3
N°4517 - PHP 8.1: Fix missing use statement
2022-05-20 09:35:23 +02:00
Molkobain
2b0cc4d0e7
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 20:01:52 +02:00
Molkobain
60aaa01e2e
N°4517 - PHP 8.1: Replace strlen() usages with utils::StrLen() for compatibility
2022-05-18 19:59:20 +02:00
Molkobain
4eb43cd02d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 19:29:57 +02:00
