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
Anne-Catherine
b061c29a5b
N°2250 - DisplayObject with ormLinkSet ignore Removed ( #309 )
2022-09-13 10:33:12 +02:00
Eric Espie
7621a0fd31
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-05 12:14:57 +02:00
Pierre Goiffon
ef07f8366d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-29 13:50:34 +02:00
Molkobain
bb948fdd1b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-12 11:15:30 +02:00
Benjamin Dalsass
ca5bbc596e
pass twig environment to twig filter filter
2022-08-01 10:33:45 +02:00
Molkobain
12c9aad445
N°4517 - PHP 8.1: Fix typos
2022-07-28 11:52:28 +02:00
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
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
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
Benjamin Dalsass
bd3724be8f
symfony 5.4 (twig filter initialization correction)
2022-06-20 08:22:23 +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
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
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
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
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
Molkobain
6086131d3c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-20 09:36:03 +02:00
Molkobain
2b0cc4d0e7
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 20:01:52 +02:00
Molkobain
4eb43cd02d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-05-18 19:29:57 +02:00
Molkobain
afc8354523
Code cleanup
2022-05-14 20:42:48 +02:00
Molkobain
23fab1bab0
N°4287 - Portal: Factorize TWIG extensions between portal and backoffice
2022-05-14 20:42:48 +02:00
Molkobain
1feb5e6ad6
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-04-08 13:32:08 +02:00
Eric Espie
f6d92a189b
CRUD reentrance protection
2022-04-05 10:28:12 +02:00
Eric Espie
c788c93542
Merge branch 'develop' into feature/faf_event_service
2022-03-30 08:22:47 +02:00
Molkobain
ad4442ae78
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-23 09:49:11 +01:00
acognet
1db4b9a12e
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-16 09:44:33 +01:00
Eric Espie
a773f0d8a2
EventService: refactoring
2022-03-15 17:53:38 +01:00
Eric Espie
29c6b73d93
EventService: refactoring
2022-03-15 17:50:13 +01:00
Eric Espie
5b52ca4776
EventService: phpdoc
2022-03-15 15:45:03 +01:00
Eric Espie
8ddaf1b731
EventService: call FireEvent with only one parameter (PSR14)
2022-03-15 15:41:55 +01:00
Eric Espie
964ce44577
EventService: code cleanup
2022-03-15 15:11:57 +01:00
Eric Espie
cea6c557ce
Merge branch 'develop' into feature/faf_event_service
2022-03-15 10:52:45 +01:00
Molkobain
f4ecdf116a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-09 19:55:35 +01:00
Molkobain
5854c199d0
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-07 12:54:13 +01:00
Eric Espie
4bdf84bf6c
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-03-03 10:23:38 +01:00
Pierre Goiffon
ee7fb15fc2
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-02-14 08:44:12 +01:00
