Eric Espie
f66692d5cf
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
2022-12-07 13:44:54 +01:00
Eric Espie
2b917f6647
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
2022-12-07 13:42:36 +01:00
Eric Espie
cda017fa4f
N°5725 - Twig update 'filter', 'map' and 'reduce' filters
2022-12-07 13:37:52 +01:00
Pierre Goiffon
dad22f6f83
📄 Update Licenses
2022-12-07 11:04:33 +01:00
Eric Espie
9474f43d61
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-oauth-client/src/Service/PopupMenuExtension.php
2022-12-02 11:20:31 +01:00
Eric Espie
9077f7ba37
N°5430 - OAuth authentication : customize redirect landing URL - remove unnecessary parameter to JS function OAuthConnect
2022-12-02 11:17:01 +01:00
Eric Espie
4d365c8a44
Merge branch 'support/2.7' into support/3.0
2022-12-02 09:26:40 +01:00
Eric Espie
957ff40f30
N°5155 - Email by SMTP with self-signed certificate (changed default values to the previous behaviour)
2022-12-02 09:25:53 +01:00
Eric Espie
7bb12c35ea
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# core/config.class.inc.php
2022-11-30 14:27:32 +01:00
Eric Espie
aff9c7748b
N°5155 - Email by SMTP with self-signed certificate
2022-11-30 14:18:11 +01:00
Eric Espie
e518d34bc9
N°5553 - OAuth 2 : Hide Client Secret
...
* client_id is now 255 chars (AttributeString)
* client_secret is now 64 chars (AttributePassword) and cannot be anymore in the uniqueness rules
* The modification of redirect_url, client_id or client_secret change the status to inactive and generate a session message to ask for token regeneration
2022-11-30 14:15:37 +01:00
Eric Espie
51a305b445
N°5725 - Twig update 'filter', 'map' and 'reduce' filters (twig functions signature changed)
2022-11-30 13:40:44 +01:00
Eric Espie
5577f4a62e
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-30 13:36:18 +01:00
Eric Espie
f0141530b9
N°5725 - Twig update 'filter', 'map' and 'reduce' filters (+1 squashed commits)
...
Squashed commits:
[00148dec5] N°5725 - Twig update 'filter', 'map' and 'reduce' filters
2022-11-30 13:28:33 +01:00
Pierre Goiffon
92a802947d
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# setup/wizardsteps.class.inc.php
2022-11-29 19:02:51 +01:00
xtophe38
ce5096a896
N°5758 Change setup test for GDPR consent ( #336 )
...
We were using SetupUtils::IsProductVersion, but this was blocking for certain packages like TeemIP standalone.
After this change we are now relying on a new method : \SetupUtils::IsConnectableToITopHub. It will check the iTop Hub Connector module presence instead.
2022-11-29 19:00:17 +01:00
Pierre Goiffon
5efd45eafc
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# pages/ajax.render.php
2022-11-29 18:18:24 +01:00
Pierre Goiffon
23e0ed5e56
N°4449 Test for FPD detection in RuntimeDashboard
2022-11-29 18:10:17 +01:00
Pierre Goiffon
d412a52fcc
N°4449 Fix FPD in dashboard export/import
2022-11-29 18:10:17 +01:00
Molkobain
cf5745b985
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/pdfbulkexport.class.inc.php
2022-11-26 00:09:10 +01:00
Molkobain
3e18ad590f
Fix image attributes not being visible in PDF exports
2022-11-25 19:30:35 +01:00
Eric Espie
b174aa9aeb
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-oauth-client/vendor/composer/InstalledVersions.php
# datamodels/2.x/itop-oauth-client/vendor/composer/installed.php
2022-11-25 17:37:01 +01:00
Pierre Goiffon
34f03715b6
LogChannel : add missing @since
2022-11-24 17:27:30 +01:00
Eric Espie
6a0cdb8705
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-oauth-client/vendor/composer/InstalledVersions.php
# datamodels/2.x/itop-oauth-client/vendor/composer/installed.php
2022-11-24 14:35:51 +01:00
Eric Espie
22111bf667
N°5611 - Fix missing composer files in itop-oauth-client
2022-11-24 14:32:51 +01:00
Eric Espie
6d0c46595d
N°5611 - Fix missing composer files in itop-oauth-client
2022-11-24 14:27:42 +01:00
Eric Espie
1e2205ecb0
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-24 13:58:12 +01:00
Eric Espie
d292a6b0c3
N°5333 - OAuth and iTop url change
2022-11-24 13:55:36 +01:00
Eric Espie
74702c8d06
N°5430 - OAuth authentication : customize redirect landing URL
2022-11-24 13:55:36 +01:00
Pierre Goiffon
df4a205ba0
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-24 09:00:56 +01:00
Pierre Goiffon
e9c91d986d
📝 CONTRIBUTING : fix typo (stash in stead of squash)
...
Thanks Molkobain ! (https://github.com/Combodo/iTop/pull/371#discussion_r1030759606 )
2022-11-24 09:00:32 +01:00
Eric Espie
feafd5e2c9
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
N°5741 - remove use of get_config_parameter and get_module_setting in Twig
# Conflicts:
# application/twigextension.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# sources/application/TwigBase/Twig/Extension.php
2022-11-23 17:38:27 +01:00
Eric Espie
70a6b276ca
Merge branch 'issue/5685-UpgradeApereoPHPCas' into support/2.7
2022-11-23 15:58:36 +01:00
Eric Espie
f77361ceb2
N°5685 - Upgrade apereo/phpcas
2022-11-23 15:53:43 +01:00
Eric Espie
75f4751b82
N°5741 - remove use of get_config_parameter in Twig
2022-11-23 15:09:20 +01:00
Eric Espie
65b6c0f4ea
Fix CI
2022-11-23 11:04:58 +01:00
Eric Espie
c05684945f
Fix CI
2022-11-23 10:34:24 +01:00
Eric Espie
6b1c033ec1
Fix CI
2022-11-23 09:54:30 +01:00
Eric Espie
4f14d1fb23
N°4974 - Session rework
2022-11-22 15:38:02 +01:00
Molkobain
8c95bd5a65
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-16 19:04:21 +01:00
Romain Quetiez
b56f2f56f1
N°5704 - Fix compatibility with PHP <7.3 (HEREDOC syntax)
2022-11-16 17:12:53 +01:00
Eric Espie
282d47aed4
N°5727 - REST API/get_related: Seemingly wrong results, when using [impacts, up] with [redundancy: true]
2022-11-16 13:51:38 +01:00
Eric Espie
2f8f0b658c
N°5722 - code hardening
2022-11-16 09:40:19 +01:00
Eric Espie
e4884470ad
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-16 09:38:31 +01:00
Eric Espie
68d44fa981
N°5724 - code hardening
2022-11-16 09:32:47 +01:00
Eric Espie
7e5307bd96
N°4867 - "Twig content not allowed" error
2022-11-16 09:31:42 +01:00
Molkobain
5839d0e8e3
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/ItopTestCase.php
2022-11-08 21:14:50 +01:00
Romain Quetiez
cd010afb48
N°5704 - Unit tests on XML assembly ( #329 )
...
* Add a complete test suite for XML assembly
* Add a complete test suite for XML assembly
* Dispatched the test of GetDelta into real unit tests
* Add test for GetDelta on a rename operation
* Add comments on a weird case and a case on rename
* Update XML version after rebase from develop to support/2.7
* Fix phpdoc about coverage
* Remove ModelFactory::GetRootDirs and ItopTestCase::RecurseRmDir+CreateTmpDir+RecurseMkDir+RecurseCopy, that were meant to be introduced in iTop 3.0 and have been copied here by mistake, when rebasing the branch from develop to 2.7.0
* Update test/ItopTestCase.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update test/setup/ModelFactoryTest.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
* Update test/ItopTestCase.php
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
Co-authored-by: Pierre Goiffon <pierre.goiffon@combodo.com >
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-11-08 19:43:07 +01:00
Pierre Goiffon
be5a252be7
iTopDesignTestFormat : improve code readability
2022-11-08 18:14:20 +01:00
Pierre Goiffon
073488a7bd
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-11-08 17:27:26 +01:00
