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 |
|
Molkobain
|
ee783257d9
|
Merge remote-tracking branch 'origin/support/3.0' into develop
# Conflicts:
# lib/symfony/polyfill-iconv/Resources/charset/from.big5.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php
# lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php
# lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php
# lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php
# lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php
# lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php
# lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php
|
2022-07-28 10:11:13 +02:00 |
|
Molkobain
|
77aa154388
|
Convert line endings to LF on misaligned text files
|
2022-07-28 10:02:18 +02:00 |
|
Molkobain
|
414e1542d0
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# datamodels/2.x/authent-external/ja.dict.authent-external.php
# datamodels/2.x/authent-local/da.dict.authent-local.php
# datamodels/2.x/authent-local/ja.dict.authent-local.php
|
2022-07-28 10:00:32 +02:00 |
|
Molkobain
|
0687f9a0a9
|
Convert line endings to LF on misaligned text files
|
2022-07-28 09:58:04 +02:00 |
|
Molkobain
|
6e75ab2889
|
Add .gitattributes to enforce line endings
More info: https://docs.github.com/en/get-started/getting-started-with-git/configuring-git-to-handle-line-endings
|
2022-07-28 09:44:42 +02:00 |
|
Molkobain
|
d4a0c141b3
|
#296 Fix typos
|
2022-07-27 10:35:37 +02:00 |
|
Benjamin Dalsass
|
192dd86469
|
correct composer PHP max version and update setup utils constant
|
2022-07-27 08:54:39 +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 |
|
Molkobain
|
76062ca8b2
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-26 22:32:22 +02:00 |
|
Molkobain
|
a80cfb6b05
|
N°5302 - Code cleanup
|
2022-07-26 22:18:21 +02:00 |
|
Molkobain
|
6ee67a2a36
|
N°5108 - Fix variable name
|
2022-07-26 22:11:38 +02:00 |
|
Molkobain
|
a11bbd667a
|
Fix typos
|
2022-07-26 20:09:37 +02:00 |
|
Pierre Goiffon
|
ce7f251064
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-26 17:21:59 +02:00 |
|
Pierre Goiffon
|
7268cf7311
|
👥 Add @nv35 to contributors list! 🙌
See #183
|
2022-07-26 17:21:19 +02:00 |
|
Stephen Abello
|
5e497aff90
|
Update OAuth Azure
|
2022-07-26 14:36:58 +02:00 |
|
Stephen Abello
|
70d1504cd4
|
Update guzzle library
|
2022-07-26 14:36:58 +02:00 |
|
Benjamin Dalsass
|
742ef2b23b
|
Update pelago/emogrifier bundle (^6.0.0)
>> files omitted
|
2022-07-26 14:36:58 +02:00 |
|
Benjamin Dalsass
|
f6c50733fc
|
Update pelago/emogrifier bundle (^6.0.0)
|
2022-07-26 14:36:58 +02:00 |
|
Benjamin Dalsass
|
25a612da04
|
Update Symfony bundles
|
2022-07-26 14:36:58 +02:00 |
|
Benjamin Dalsass
|
31cc294cc3
|
Upgrade composer php max version to 8.1
|
2022-07-26 14:36:58 +02:00 |
|
bdalsass
|
d93a0b698b
|
N°5281 - Portal: Add method to declare brick controller since Symfony 5.4 migration (#313)
* Add controllers declaration interface to ItopExtensionsExtraRoutes
* N°3390 - Upgrade from Symfony 3.4 to Symfony 5.4
Container setter issues
* Show Symfony original error page when app debug is on
* Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Routing/ItopExtensionsExtraRoutes.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
* Update datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
|
2022-07-25 14:19:47 +02:00 |
|
Molkobain
|
9cf329c475
|
Add @Timmy38 to the sample data, welcome! 👋
|
2022-07-25 11:50:04 +02:00 |
|
Molkobain
|
f978cc4e22
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-20 17:51:29 +02:00 |
|
Molkobain
|
6cda9e001f
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2022-07-20 17:48:47 +02:00 |
|
Molkobain
|
b90d29d448
|
🔧 Add IntelliLang.xml file to provide PHP synthax highlighting in DM XML files
|
2022-07-20 17:48:01 +02:00 |
|
Molkobain
|
494b70950c
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-18 16:49:05 +02:00 |
|
Molkobain
|
808092acdd
|
N°5311 - Update deprecation comment to match PHP deprecations convention
|
2022-07-18 16:05:41 +02:00 |
|
Molkobain
|
b9c716a247
|
N°5102 - Convert line separators
|
2022-07-18 15:58:11 +02:00 |
|
Molkobain
|
f71fadda17
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-18 14:17:16 +02:00 |
|
Molkobain
|
bf7b2e1e7e
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2022-07-18 14:15:50 +02:00 |
|
Molkobain
|
1f78bf4119
|
N°5287 - Fix license in composer.json
|
2022-07-18 13:52:40 +02:00 |
|
Molkobain
|
91c73b562a
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-13 17:15:53 +02:00 |
|
Molkobain
|
28df2dad60
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts:
# js/wizardhelper.js
|
2022-07-13 17:11:04 +02:00 |
|
Molkobain
|
5d25e77189
|
Code format
|
2022-07-13 17:03:01 +02:00 |
|
Molkobain
|
d9dabf25da
|
PHPDoc
|
2022-07-13 17:03:01 +02:00 |
|
Molkobain
|
73af605892
|
Fix typo in dictionaries
|
2022-07-13 17:03:00 +02:00 |
|
Eric Espie
|
3ae862d690
|
N°5310 - Mail to ticket: Migration 3.1 - PHPMail
|
2022-07-12 13:37:02 +02:00 |
|
Molkobain
|
51d5c00bcd
|
N°5313 - Remove "enable_formmanager_content_check" module parameter from itop-portal
|
2022-07-12 12:06:35 +02:00 |
|
Molkobain
|
99b4fceaf3
|
Merge remote-tracking branch 'origin/support/3.0' into develop
|
2022-07-12 11:43:49 +02:00 |
|
Molkobain
|
a71d8a660f
|
N°5311 - Deprecate old backoffice stylesheets
|
2022-07-12 11:20:48 +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
|
03b56b2941
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0 : wrong positioning of module_parameters for portal
|
2022-07-11 16:26:41 +02:00 |
|
Eric Espie
|
01ee91d003
|
N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* migration to iTop 3.0
|
2022-07-11 15:20:47 +02:00 |
|
Benjamin Dalsass
|
f70f95c119
|
Update community licence 2.7.7 (script from git bash, not php execution)
2.7.7
|
2022-07-11 15:20:36 +02:00 |
|
Eric Espie
|
badc5ff3ec
|
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
|
2022-07-11 15:20:29 +02:00 |
|
Eric Espie
|
8dbdcdcb25
|
autoloader updated
|
2022-07-11 14:18:44 +02:00 |
|
Eric Espie
|
13533a2fa9
|
⬆️ libs upgrade
|
2022-07-11 14:18:20 +02:00 |
|
Eric Espie
|
e4343ded01
|
autoloader updated
|
2022-07-11 09:24:24 +02:00 |
|