Eric Espie
7f88a6aa1a
Merge branch 'support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
2022-12-08 08:39:55 +01:00
Eric Espie
26042b990f
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
2022-12-08 08:34:16 +01:00
Eric Espie
cf433f2f80
N°5725 - Twig update 'filter', 'map' and 'reduce' filters
2022-12-08 08:25:11 +01:00
Eric Espie
ae94e58a43
N°5725 - Twig update 'filter', 'map' and 'reduce' filters
2022-12-07 13:53:15 +01:00
Eric Espie
e4d8489292
Merge branch 'support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
2022-12-07 13:52:42 +01:00
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
bdalsass
dbe7fae82e
Feature/modals - generic modal API ( #373 )
...
Default modal JS Implementation:
Add title option
Add buttons option
Change template cloning
Confirmation Modal:
Add implementation
Do not show again functionality
Web Page:
Add blocks array with twig loop insertion
2022-12-06 10:18:59 +01:00
Eric Espie
e6946d33e6
Merge branch 'support/3.0' into develop
2022-12-02 11:21:04 +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
93e0dde1a1
Merge branch 'support/3.0' into develop
...
# Conflicts:
# sources/Core/Email/EmailSwiftMailer.php
Email by SMTP with self-signed certificate ported from EmailSwiftMailer to EmailLaminas
2022-11-30 14:35:13 +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
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
f02e95e8bf
Merge branch 'support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# test/twig/test.html
# test/twig/test.html.twig
2022-11-30 13:57:28 +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
Vladimir Kunin
98bcfeb2ba
🐛 N°5369 - Fix BrowseBrick tree "opening_target" mode for "self" and "new" values ( #299 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-11-30 11:45:06 +01:00
Eric Espie
ded2f8af9a
Fix CI
2022-11-29 14:39:16 +01:00
Molkobain
084f3ec52b
N°5655 - Continue work on CombodoModal Part 2
2022-11-28 15:57:25 +01:00
Eric Espie
ebf3f48584
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-oauth-client/vendor/composer/installed.php
2022-11-24 14:37:35 +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
8db89c3d5f
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-11-24 13:58:52 +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
Eric Espie
649674c786
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# application/twigextension.class.inc.php
# datamodels/2.x/authent-cas/composer.json
# datamodels/2.x/authent-cas/composer.lock
# datamodels/2.x/authent-cas/main.php
# datamodels/2.x/authent-cas/vendor/apereo/phpcas/composer.json
# datamodels/2.x/authent-cas/vendor/composer/ClassLoader.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_classmap.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_psr4.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_real.php
# datamodels/2.x/authent-cas/vendor/composer/autoload_static.php
# datamodels/2.x/authent-cas/vendor/composer/installed.json
# datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php
# lib/apereo/phpcas/source/CAS.php
# lib/apereo/phpcas/source/CAS/Client.php
# lib/apereo/phpcas/source/CAS/Languages/Galego.php
# lib/apereo/phpcas/source/CAS/Languages/Portuguese.php
# lib/symfony/cache-contracts/InstalledVersions.php
# lib/symfony/cache-contracts/installed.php
# lib/symfony/cache-contracts/platform_check.php
# sources/Application/UI/Base/Layout/NavigationMenu/NavigationMenu.php
# sources/application/TwigBase/Twig/Extension.php
2022-11-24 13:17:09 +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
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
Molkobain
a0a5037554
Merge remote-tracking branch 'origin/feature/5655-edit-object-in-modal' into develop
...
# Conflicts:
# pages/ajax.render.php
2022-11-23 15:59:23 +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
Pierre Goiffon
6258b97b92
N°5563 Convert datamodels files with new 3.1 conversion methods
2022-11-21 09:15:23 +01:00
Molkobain
36ec455e6d
N°5655 - Refactor portal modal dialog helper to global helper for both GUIs
2022-11-15 08:42:25 +01:00
DudekArtur
07fc8c1e5b
N°5706 - Update polish translations thanks to @DudekArtur ! ( #357 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-11-08 21:06:25 +01:00
Molkobain
5e0698b7f3
Add support for "Ctrl + Enter" and "Meta (Cmd) + Enter" submit on multi-line fields
2022-11-08 17:28:42 +01:00
Lars Kaltefleiter
2dccedf8d7
🐛 navigation menu z-index workaround for safari
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-11-08 17:25:49 +01:00
Eric Espie
e496513275
cleanup code (php warning)
2022-10-31 15:09:16 +01:00
Molkobain
7028b2f76c
N°4703 - Fix english translations of "in-person"
2022-10-19 17:24:05 +02:00
Thomas Casteleyn
4baff1b3d1
N°4703 Add Dutch translations to new origins ( #352 )
...
* Add Dutch translations
* Update description
2022-10-19 16:51:48 +02:00
Molkobain
9c4f1419b1
N°4703 - Add "chat" / "in person" as possible "origin" value for tickets
2022-10-19 16:51:48 +02:00
Molkobain
848c4ca204
N°4798 - Align attribute "description" type for Service class
2022-10-19 16:31:07 +02:00
BenGrenoble
1e0fc4714d
Correction of the system tooltip, following discussion with Molkobain
2022-10-13 09:31:09 +02:00
BenGrenoble
acd8944aec
Add tooltip on System
2022-10-06 16:01:30 +02:00
Pierre Goiffon
5b1b5b0cc1
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-10-03 15:56:16 +02:00
