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
Pierre Goiffon
c02b36a00c
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-10-03 15:56:02 +02:00
Pierre Goiffon
1e1f1f78bf
📝 Backup : more details on check-backup parameters
2022-10-03 14:41:44 +02:00
Pierre Goiffon
1494604740
📝 Backup : move info from wiki to distrib file
2022-10-03 14:35:14 +02:00
Timmy38
30664bc5ec
N°4765 fixing a typo
2022-09-30 11:30:42 +02:00
Eric Espie
f32f36fc74
N°5551 - System information database size is way off
2022-09-26 11:51:51 +02:00
Eric Espie
b9d865f881
N°4756 - Fix DBInsert/NoReload call order
2022-09-21 18:08:44 +02:00
Eric Espie
d1414a3f34
N°4756 - revert events for datamodel/2.x objects for backward compatibility
2022-09-20 15:35:59 +02:00
Eric Espie
71464f6d0e
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/cmdbobject.class.inc.php
# core/dbobject.class.php
# core/designdocument.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-09-19 09:45:08 +02:00
Eduardo Mozart de Oliveira
9f963686b5
N°4765 - Update brazilian translations thanks to @eduardomozart ( #268 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2022-09-13 17:20:53 +02:00
Eric Espie
5d9e58f194
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-12 11:48:44 +02:00
Eric Espie
d50fe1573c
Merge branch 'support/3.0.2' into support/3.0
...
# Conflicts:
# application/loginbasic.class.inc.php
# application/loginexternal.class.inc.php
# application/loginform.class.inc.php
# application/loginurl.class.inc.php
2022-09-12 11:00:07 +02:00
Eric Espie
ca3c0cb163
N°5510 - Exception "$amount: Expected 5% to be within 0% and 1%" when compiling a theme
2022-09-09 09:20:52 +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
6c4cd6c99c
constants missing if no ticket in DM (vanilla)
2022-09-02 13:57:36 +02:00
Molkobain
146ed0f6a6
N°3390 - Update comment
2022-08-30 20:18:30 +02:00
Molkobain
bdda29ef6a
Merge remote-tracking branch 'origin/support/3.0.2' into support/3.0
2022-08-30 17:46:25 +02:00
Benjamin Dalsass
b154952869
N°3390 - Upgrade from Symfony 3.4 to Symfony 5.4
2022-08-30 14:36:26 +02:00
Molkobain
6e3ff0e429
Update iTop version to 3.0.2
2022-08-29 09:40:47 +02:00
Molkobain
a2c6b08cf4
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
2022-08-16 17:52:03 +02:00
Molkobain
efd2fbb19a
Fix module version after wrong merge
2022-08-16 17:49:23 +02:00
Molkobain
25af155113
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
2022-08-16 17:38:10 +02:00
Molkobain
c8b82e6e48
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# approot.inc.php
# css/css-variables.scss
# datamodels/2.x/authent-cas/module.authent-cas.php
# datamodels/2.x/authent-external/module.authent-external.php
# datamodels/2.x/authent-ldap/module.authent-ldap.php
# datamodels/2.x/authent-local/module.authent-local.php
# datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
# datamodels/2.x/itop-attachments/module.itop-attachments.php
# datamodels/2.x/itop-backup/module.itop-backup.php
# datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
# datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
# datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
# datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
# datamodels/2.x/itop-config/module.itop-config.php
# datamodels/2.x/itop-core-update/module.itop-core-update.php
# datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
# datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
# datamodels/2.x/itop-files-information/module.itop-files-information.php
# datamodels/2.x/itop-full-itil/module.itop-full-itil.php
# datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
# datamodels/2.x/itop-incident-mgmt-itil/module.itop-incident-mgmt-itil.php
# datamodels/2.x/itop-knownerror-mgmt/module.itop-knownerror-mgmt.php
# datamodels/2.x/itop-oauth-client/module.itop-oauth-client.php
# datamodels/2.x/itop-portal-base/module.itop-portal-base.php
# datamodels/2.x/itop-portal/module.itop-portal.php
# datamodels/2.x/itop-problem-mgmt/module.itop-problem-mgmt.php
# datamodels/2.x/itop-profiles-itil/module.itop-profiles-itil.php
# datamodels/2.x/itop-request-mgmt-itil/module.itop-request-mgmt-itil.php
# datamodels/2.x/itop-request-mgmt/module.itop-request-mgmt.php
# datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php
# datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php
# datamodels/2.x/itop-sla-computation/module.itop-sla-computation.php
# datamodels/2.x/itop-storage-mgmt/module.itop-storage-mgmt.php
# datamodels/2.x/itop-tickets/module.itop-tickets.php
# datamodels/2.x/itop-virtualization-mgmt/module.itop-virtualization-mgmt.php
# datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php
# datamodels/2.x/version.xml
2022-08-16 17:35:00 +02:00
Lars Kaltefleiter
ae021064a4
🌐 Update German translations for oauth-client ( #319 )
2022-08-16 17:02:37 +02:00
Molkobain
8f0a62c1c9
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-16 12:17:23 +02:00
Molkobain
c8cb64db24
N°4739 - Remove precompiled themes unit test as they are no longer used since the introduction of DM classes style SCSS
2022-08-16 11:48:38 +02:00
Benjamin Dalsass
0a61169326
Update version to next release 2.7.8
2022-08-16 09:47:46 +02:00
Eric Espie
6a384b0405
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-12 10:51:46 +02:00
Stephen Abello
bd97d9c7ca
Replace OAuth object subtitle icon with a solid icon for more harmony
2022-08-12 09:53:24 +02:00
Stephen Abello
94b9fda354
Remove OAuth object subtitle tooltip as it's always empty
2022-08-12 09:53:24 +02:00
acognet
ebab664c1a
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-11 16:54:43 +02:00
jbostoen
d17e399a5f
🌐 N°5397 - Updated Dutch translations ( #262 )
...
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com >
2022-08-11 14:07:51 +02:00
Eric Espie
7a9e16766f
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-10 15:28:13 +02:00
