Pierre Goiffon
2f5eaa2dfd
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# sources/Core/Email/EmailSwiftMailer.php
2022-09-14 15:36:14 +02:00
Pierre Goiffon
091aaac55e
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-09-14 15:34:36 +02:00
Pierre Goiffon
d431811725
N°4947 Fix Email always picking "production" env config file ( #331 )
...
Note that the code was duplicated in both Email* impl, this is refactored : LoadConfig and m_oConfig are pulled up in Email, and SetRecipientFrom() calls are also refactored in Email
2022-09-14 15:33:48 +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
Eric Espie
57bb0160c4
Merge branch 'support/3.0.2' into support/3.0
2022-09-05 12:08:53 +02:00
Eric Espie
6190429f51
N°5394 - Rework session start
2022-09-01 16:08:16 +02:00
Pierre Goiffon
ef07f8366d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-29 13:50:34 +02:00
Stephen Abello
bc7749602d
Merge branch 'support/3.0.2' into support/3.0
...
# Conflicts:
# setup/setup.js
2022-08-24 16:46:16 +02:00
Molkobain
bdf11e32a7
N°5318 - Security hardening
2022-08-24 10:47:40 +02:00
Pierre Goiffon
2f90b8e6a6
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-22 09:04:39 +02:00
acognet
d33bd88832
N°5428 - Request template: autocomplete field can not be a master field
2022-08-19 15:06:38 +02:00
acognet
c94e24c0ff
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/cmdbabstract.class.inc.php
2022-08-12 18:17:00 +02:00
Anne-Catherine
bacdd63dd4
N°3979 - Handle initial values on dependent fields ( #325 )
...
N°3979 - Handle initial values on dependent fields
2022-08-12 17:48:53 +02:00
Molkobain
bb948fdd1b
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-12 11:15:30 +02:00
Molkobain
8e7aef17c6
N°4903 - Fix dynamic "app_root_url" conf. param. not used properly for the app. icon
2022-08-12 11:11:55 +02:00
Molkobain
24f2416427
Navigation menu: Fix duplicated conf. property code usage
2022-08-12 11:11:55 +02:00
Eric Espie
8fab14f072
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-10 15:01:54 +02:00
Eric Espie
7f7538ed58
N°5395 - Errors from OAuth servers for email are not well handled
2022-08-10 14:59:32 +02:00
Eric Espie
8fa616f440
N°5395 - Errors from OAuth servers for email are not well handled
2022-08-10 14:57:26 +02:00
Stephen Abello
8cdc251378
Merge branch 'support/3.0' into develop
2022-08-08 16:42:24 +02:00
Stephen Abello
0599341515
N°4975 Security hardening
2022-08-08 15:07:02 +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
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
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
