Pierre Goiffon
fb64fbab0b
Fix syntax error in Darkmoon theme
2022-06-08 18:10:03 +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
86024107af
deprecated includes
2022-06-08 15:55:20 +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
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
Pierre Goiffon
596c62aec8
💡 N°4867 Add bug reference in phpdoc
2022-06-03 09:54:29 +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
e77f21a0b5
refactor Event Listeners
2022-06-01 14:29:43 +02:00
Eric Espie
35e1f080b8
Attachments events
2022-06-01 11:46:00 +02:00
Eric Espie
812c1f6bb4
Migrate datamodel
2022-06-01 11:19:46 +02:00
Eric Espie
f6855b0d2b
Display events in the datamodel page
2022-06-01 08:44:12 +02:00
Benjamin Dalsass
9fd10bd73e
N°5168 - Security hardening
2022-05-31 16:28:02 +02:00
Eric Espie
c9317542c8
refactor
2022-05-31 15:37:29 +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
e7c09c83f0
internal doc
2022-05-25 10:59:38 +02:00
Eric Espie
b827c68187
Merge branch 'develop' into feature/faf_event_service
2022-05-25 10:04:54 +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
Eric Espie
a6580e3cd8
Merge branch 'support/2.7' into feature/OAuthMail
2022-05-23 10:56:32 +02:00
Benjamin Dalsass
d01e4b4a85
N°5168 - Security hardening
2022-05-20 16:08:25 +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
183c3c1baf
N°4666 - Core Update : handle modules
2022-05-19 16:30:06 +02:00
Eric Espie
160c52fe81
Merge branch 'support/2.7' into feature/OAuthMail
2022-05-19 14:49:48 +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
0ef4fee0b4
N°4985 - PHP 8.0: Fix usort callback return type
2022-05-17 15:28:04 +02:00
Molkobain
e909eac98e
N°4985 - PHP 8.0: Fix is_callable() first param syntax in ObjectFormManager
2022-05-16 17:44:34 +02:00
Molkobain
5e42efc3ec
N°4985 - PHP 8.0: Fix usort callback return type in portal's lists initialization
2022-05-16 17:44:33 +02:00
acognet
438b84d4ee
N°3141 - Deprecate legacy SQL build
2022-05-16 09:24:42 +02:00
Molkobain
23fab1bab0
N°4287 - Portal: Factorize TWIG extensions between portal and backoffice
2022-05-14 20:42:48 +02:00
Eric Espie
134736dce5
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
* 2.7 migration (wip)
2022-05-13 11:37:09 +02:00
Timmy38
891dd31290
N°5072 - Fix default priority to undefined (null) or default value if not nullable ( #279 )
...
* Fix default priority to undefined
* Default priority : if null value not allowed, use default value for priority
* Default priority : moving code from ComputeValues() to ComputePriority()
* Default priority : re-indenting code
2022-05-10 17:36:56 +02:00
acognet
6a4217e87b
N°3950 - Deprecate old unreferenced methods that are @deprecated - remove ajaxwebpage and iTopWebPage
2022-05-10 16:39:31 +02:00
Pierre Goiffon
f4c7afc148
N°4824 Update consumers & tests after nikic/php-parser update
...
Was done in 3.0.0 with N°3867
(cherry picked from commit cd1ba097cb5b42f67a992d98ca2318ddc5bbd1bb
2022-04-29 15:24:56 +02:00
vdumas
c0f0e354dd
N°5124 - ConnectableCI to NetworkDevice update failing
2022-04-26 13:03:43 +02:00
vdumas
d6f58d04f1
N°4702 - DataModel : wrong attribute type for SLA.customercontracts_list
2022-04-25 15:08:46 +02:00
vdumas
cc88ee1de0
Revert "N°4702 - DataModel : wrong attribute type for SLA.customercontracts_list"
...
This reverts commit 6b7183d500706a2bcf6340eca3478a7ca22ce7e3.
2022-04-25 15:08:46 +02:00
vdumas
8008e4d840
N°4702 - DataModel : wrong attribute type for SLA.customercontracts_list
2022-04-25 15:08:46 +02:00
Molkobain
a4390fbb57
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# test/application/search/CriterionConversionTest.php
# test/application/search/CriterionParserTest.php
# test/application/search/SearchFormTest.php
2022-04-25 14:03:02 +02:00
vdumas
f4170ade8a
N°4702 - DataModel : wrong attribute type for SLA.customercontracts_list
2022-04-25 10:23:12 +02:00
Pierre Goiffon
f4a027b474
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# composer.json
# core/cmdbchangeop.class.inc.php
# core/cmdbobject.class.inc.php
# css/light-grey.scss
# setup/setuputils.class.inc.php
# test/ItopTestCase.php
# test/core/ConfigTest.php
# test/core/LogAPITest.php
# test/core/UserRightsTest.php
# test/core/dictApcuTest.php
# test/core/dictTest.php
# test/core/iTopConfigParserTest.php
# test/core/ormLinkSetTest.php
# test/phpunit.xml.dist
# test/postbuild_integration.xml.dist
# test/setup/SetupUtilsTest.php
# test/status/StatusIncTest.php
# webservices/cron.php
2022-04-22 15:26:18 +02:00
vdumas
1d9a9bcb28
N°3889 - Missing default search zlist on SLA and SLT
2022-04-22 12:52:01 +02:00
