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
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
dd8a4a0082
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
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
2022-05-12 14:40:55 +02:00
Eric Espie
34cac2ac1b
No autoload for deprecated class
2022-05-10 14:57:04 +02:00
Pierre Goiffon
afaf72573b
➖ N°4284 remove unused dependencies
2022-04-29 17:13:58 +02:00
Pierre Goiffon
32ed40e733
➖ N°4284 remove unused dependencies
2022-04-29 17:11:10 +02:00
Pierre Goiffon
64b25c4daa
📌 N°4284 Composer libs : fix twig/twig to ~1.42.5
...
Without specifying explicitly the Twig version, since the update of require php from 5.6 to 7.0 we are getting Twig 2.12.5 !
We don't want Twig 2 as this version changes the macro scope and causes massive changes in our code... This update will be done later in other branches.
2022-04-29 15:15:32 +02:00
Molkobain
5960dc6245
N°2435.1 Portal: Split portal composer.json in 2
...
- Autoloader for portal files in the itop-portal-base module
- Dependencies moved to root composer.json
- Add autoloader for /core and /application content
2019-08-13 10:34:22 +02:00
