Molkobain
bedc8bbf46
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-11-26 00:25:05 +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
4ec3f22173
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# core/log.class.inc.php
2022-11-24 17:28:39 +01:00
Pierre Goiffon
34f03715b6
LogChannel : add missing @since
2022-11-24 17:27:30 +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
Benjamin Dalsass
038e6d7f3f
datatable - row actions - allow returning null
2022-11-24 09:16:02 +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
bdalsass
bdb29fd99a
Issue/5074 - Routage, Block UI relations, Links row actions ( #369 )
...
* datatable row actions
Below is a sample of extra param to enable feature:
$aExtraParams['row_actions'] = [
[
'tooltip' => 'remove an element',
'icon_css_class' => 'fa-minus',
'js_row_action' => 'console.log("You clicked the remove button");',
'confirmation' => [
'message' => 'UI:ConfirmationMessage',
'message_row_data' => "name",
'remember_choice_pref_key' => 'remove_do_not_show_again',
],
],
[
'tooltip' => 'open in new tab',
'icon_css_class' => 'fa-external-link-square-alt',
'on_action_js' => 'window.open("http://localhost/itop-branchs/dev/pages/UI.php?operation=details&class=UserRequest&id= " + aData.id + "&c[menu]=UserRequest%3AOpenRequests");',
],
[
'tooltip' => 'other actions',
'icon_css_class' => 'fa-ellipsis-v',
'on_action_js' => 'console.log(event);',
],
];
* Contrôleur pour la suppression et le détachement de liens
* Block UI pour l'édition des relations
* Block UI pour la visualisation des relations
* Boutons d'actions pour la suppression et le détachement de liens
* Gestion dialogue de confirmation pour les row actions
2022-11-23 16:10:34 +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
Eric Espie
6af62c4a50
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-11-23 11:07:09 +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
odain
0ef5e9d3ff
N°5620 - Hide the organization filter with a conf parameter
2022-11-22 13:57:42 +01:00
odain
1c705bdb94
ci: fix ItopDataTestCase CreateUser contactid unset
2022-11-22 13:57:37 +01:00
odain
28a1324d3a
ci: adapt impersonate test to any friendlyname output
2022-11-22 13:57:37 +01:00
odain
af51f05c56
ci: add CreateContactlessUser method in test framework
2022-11-22 13:57:37 +01:00
Pierre Goiffon
1a7b3f0631
N°5563 Fix setup crash when notices enabled and invalid edit_mode value
2022-11-22 09:56:31 +01:00
Eric Espie
4ff82f5c12
Fix CI
2022-11-21 09:54:36 +01:00
Eric Espie
e2e08351b0
Fix CI
2022-11-21 09:51:11 +01:00
Pierre Goiffon
d83c45812d
N°5405 UpdateXML update tool now do a full file conversion
2022-11-21 09:15:43 +01:00
Pierre Goiffon
6258b97b92
N°5563 Convert datamodels files with new 3.1 conversion methods
2022-11-21 09:15:23 +01:00
Pierre Goiffon
3aab49c372
N°5563 AttributeLinkedSet & LinkedSetIndirect conversions between 3.0 and 3.1 formats
2022-11-21 09:15:17 +01:00
Pierre Goiffon
ecfae75e10
Setup : catch also fatal error during conversion
2022-11-18 20:15:00 +01:00
Pierre Goiffon
f60331e0f9
✅ iTopFormatTest : better info on conversion error
2022-11-18 20:14:59 +01:00
Pierre Goiffon
8f6065d4f4
✅ ♻️ iTopDesignFormatTest : get version directly from expected content
2022-11-18 19:15:56 +01:00
Eric Espie
52c984d5e7
N°4756 - Fix Unit tests
2022-11-18 10:49:59 +01:00
Eric Espie
6585f717c5
N°4756 - Event service initialization
2022-11-16 21:03:01 +01:00
Molkobain
363a1507cf
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-11-16 19:06:51 +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
0bba9b0fad
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-11-16 13:57:07 +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
