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
7176218a5f
composer autoload mapping correction
2022-06-10 07:37:00 +02:00
Pierre Goiffon
fb64fbab0b
Fix syntax error in Darkmoon theme
2022-06-08 18:10:03 +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
6e4fb5888c
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
...
* migration to iTop 3.0
2022-06-08 15:47:52 +02:00
Eric Espie
c94c727058
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
* migration to iTop 3.0
2022-06-08 15:46:29 +02:00
Benjamin Dalsass
a0c78a94c6
Merge remote-tracking branch 'origin/support/3.0' into support/3.0
...
# Conflicts:
# core/log.class.inc.php
2022-06-08 13:05:50 +02:00
Benjamin Dalsass
f014ebfeb1
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/log.class.inc.php
# setup/modelfactory.class.inc.php
2022-06-08 13:04:50 +02:00
Benjamin Dalsass
220b384479
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/log.class.inc.php
# setup/modelfactory.class.inc.php
2022-06-08 12:38:41 +02:00
odain
4c585614cd
ease testing: CreateTestOrganization returns org object
2022-06-08 11:07:31 +02:00
Eric Espie
9674378c56
N°5211 - Core update not working with auto-selected modules (comments)
2022-06-08 10:36:55 +02:00
Eric Espie
9e314ba77b
N°5211 - Core update not working with auto-selected modules
2022-06-08 10:24:03 +02:00
Eric Espie
cdd7dcdc5c
N°5211 - Core update not working with auto-selected modules
2022-06-08 10:12:19 +02:00
Benjamin Dalsass
34bed5ec4f
N°5215 - Portal insufficient access control for ajax search form
2022-06-07 11:14:43 +02:00
Pierre Goiffon
3ea82e37d5
N°4635 Report \LogChannels::NOTIFICATIONS
2022-06-03 18:00:29 +02:00
Pierre Goiffon
596c62aec8
💡 N°4867 Add bug reference in phpdoc
2022-06-03 09:54:29 +02:00
Benjamin Dalsass
834084a3e2
Correct dictionary entry
2022-06-02 17:15:10 +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
acognet
265415030e
N°4867 - "Twig content not allowed" error when use the extkey widget search icon in the user portal - Add comment
2022-06-02 12:35:42 +02:00
Eric Espie
3d26f28f9b
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
...
* Add icons to wizard
2022-06-01 11:44:02 +02:00
Eric Espie
0abec767e3
Dictionaries
2022-06-01 10:45:53 +02:00
Benjamin Dalsass
9fd10bd73e
N°5168 - Security hardening
2022-05-31 16:28:02 +02:00
acognet
95dafc87c0
N°4867 - "Twig content not allowed" error when use the extkey widget search icon in the user portal - Add tests
2022-05-30 15:10:50 +02:00
acognet
fe1790793e
N°4898 - security hardening
2022-05-30 15:10:49 +02:00
Eric Espie
ddb95dc64e
Removed laminas service manager test folder
2022-05-27 09:32:16 +02:00
Eric Espie
f6f9ee26e1
Removed laminas service manager test folder
2022-05-27 09:29:00 +02:00
Eric Espie
21faa92904
Merge branch 'support/2.7' into feature/OAuthMail
2022-05-27 09:06:28 +02:00
acognet
1fd792fed9
N°3950 - Deprecate old unreferenced methods that are @deprecated - remove application/itopwebpage.class.inc.php
2022-05-25 11:35: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
acognet
964134cb60
N°4867 - "Twig content not allowed" error when use the extkey widget search icon in the user portal - Remove useless code
2022-05-24 18:20:18 +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
acognet
72f498a63b
N°5168 - Fix error message "Call to a member function GetKey() on null"
2022-05-24 10:50:56 +02:00
Pierre Goiffon
f9a1f68295
✅ N°4655 Remove OQL tests
...
Were only here to check legacy OQL engine, but since 2.7.0 we fixed couple of bugs in the current OQL engine : we can't keep same functionalities in both engines :/.
Plus now we are working on 2.7.7 and we're not aware of any use of this legacy engine...
Note that it will be deprecated (N°3141) and removed (N°4715) very soon.
2022-05-24 10:38:59 +02:00
Pierre Goiffon
9b67b0b9d5
Same options in phpunit config files
2022-05-23 14:53:13 +02:00
acognet
44ca8acf37
remove useless comment
2022-05-23 14:27:51 +02:00
acognet
f798ef1d76
N°4538 - Dashlet Groupby on ExternalKey with special character, bad display - remove useless test
2022-05-23 14:21:03 +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
Eric Espie
a6580e3cd8
Merge branch 'support/2.7' into feature/OAuthMail
2022-05-23 10:56:32 +02:00
Pierre Goiffon
da6621f2ff
Fix include warning in unittestautoload.php on Windows
2022-05-23 09:53:30 +02:00
Molkobain
f2d42a7e56
N°5002 - Simplify code
2022-05-20 18:41:39 +02:00
Benjamin Dalsass
d01e4b4a85
N°5168 - Security hardening
2022-05-20 16:08:25 +02:00
acognet
b371072a61
N°3141 - Deprecate legacy SQL build
2022-05-20 11:34:52 +02:00
acognet
d874b749d0
Revert N°3141 - Deprecate legacy SQL build
2022-05-20 11:22:20 +02:00
acognet
cff26563cc
N°3950 - Deprecate old unreferenced methods that are @deprecated - Expression:: Render
2022-05-20 11:09:03 +02:00
Pierre Goiffon
f57d1f1de3
✅ Fix PHPunit errors with InlineImageMock.php and UtilsTest
...
HTMLDOMSanitizerTest : fix "Fatal error: Cannot declare class InlineImage, because the name is already in use in /var/www/html/iTop/test/core/sanitizer/InlineImageMock.php"
We are now injecting the class to mock, instead of declaring another class with the same name (was working before but why ?!???)
\UtilsTest::testSanitizer : no more testing the "class" filter, because it is a simple indirection, and we need to load datamodel which is causing multiple problems (see the comment in the test method dataprovider)
2022-05-20 10:48:05 +02:00
acognet
fd1064b044
N°3950 - Deprecate old unreferenced methods that are @deprecated - BulkUpdate
2022-05-20 10:40:29 +02:00
Eric Espie
a3f122184c
N°4642 - Core Update : limit the usage of this function - revert due to N°4666 fix
2022-05-20 10:20:47 +02:00
acognet
16fcddc249
N°4867 - "Twig content not allowed" error when use the extkey widget search icon in the user portal (regression of N°4384 )
2022-05-20 09:52:25 +02:00
Eric Espie
2a9c9be36a
N°4666 - Core Update : handle modules
2022-05-20 09:42:14 +02:00
