composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,097 Commits 136 Branches 134 Tags
ba21687e5fa0081a4c18758b136cb08d24b04a53
Commit Graph

12097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
acognet
ba21687e5f Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	core/bulkchange.class.inc.php
 2023-02-28 12:34:47 +01:00
Anne-Catherine
370c1345d9 N°2916 - Import of IPv6 addresses fails when reconciliation is done on the IP (#382) 2023-02-28 12:08:32 +01:00
acognet
948cbb1446 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-27 16:44:16 +01:00
Anne-Catherine
af8f06c8c3 N°5603 - Autocomplete fails with error for an external key pointing to an abstract class with no friendlyname (#375) 2023-02-27 16:18:36 +01:00
Pierre Goiffon
099a045852 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-27 15:20:12 +01:00
Pierre Goiffon
bfe55183d0 N°6023 Fix error log 
Thanks @Hipska !
 2023-02-27 15:09:49 +01:00
Eric Espie
cf5fd3e2a8 N°5906 - CRUD Event - 🎨 rename event_listeners/listener XML nodes by event_listeners/event_listener 2023-02-27 11:23:55 +01:00
Eric Espie
bb62723114 N°5906 - CRUD Event - Fix listener launched twice and refactor calls to Tickets::UpdateImpactedItems() 2023-02-27 11:17:05 +01:00
Pierre Goiffon
937313c20e N°5906 - CRUD Event - Fix \DBObject::IsCrudStackEmpty not static 2023-02-27 11:17:05 +01:00
odain
939771aa15 N°6022 - Make synchro scripts work by http via token authentication with SYNCHRO scopes 2023-02-27 11:07:52 +01:00
Molkobain
70cbaeac7a Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-24 22:42:06 +01:00
Molkobain
b174e4cab3 N°4517 - PHP 8.1: Fix deprecated notice for null value passed to string parameter of native PHP functions 2023-02-24 22:40:17 +01:00
Molkobain
b1bd1e1677 PHPUnit: Migrate deprecated usages of assertFileNotExists() and assertRegExp() 2023-02-24 21:41:53 +01:00
Molkobain
029c01b13e Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-24 21:41:05 +01:00
Molkobain
61bd8b6bb4 N°4517 - PHP 8.1: Fix deprecated notice for null value passed to string parameter of native PHP functions 2023-02-24 21:40:10 +01:00
Pierre Goiffon
3a77423b38 Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	tests/php-unit-tests/unitary-tests/application/utilsTest.php
 2023-02-23 18:57:50 +01:00
Pierre Goiffon
5c9eb7fa38 N°6020 PHPUnit for \utils::EscapeHtml and EscapedHtmlDecode methods 
This will ensure conversion back and forth is working as expected (in other words, parameters to the php functions stays the same in both methods)
 2023-02-23 18:56:28 +01:00
Pierre Goiffon
4e8a1563f8 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-23 18:38:39 +01:00
Pierre Goiffon
e960a4ad53 N°6023 Fix cannot load SVG files in AttributeImage since 3.0.0 (#449) 
Caused by merge error in ddd6bf2

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
 2023-02-23 18:38:03 +01:00
Molkobain
1980cf4700 Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	composer.json
#	composer.lock
#	lib/composer/autoload_files.php
#	lib/composer/autoload_real.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.json
#	lib/composer/installed.php
#	lib/firebase/php-jwt/README.md
#	lib/firebase/php-jwt/src/CachedKeySet.php
#	lib/firebase/php-jwt/src/JWK.php
#	lib/firebase/php-jwt/src/JWT.php
 2023-02-23 16:29:06 +01:00
Molkobain
7aad60ed1b Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	composer.json
#	composer.lock
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
#	lib/composer/platform_check.php
#	setup/setuputils.class.inc.php
 2023-02-23 16:21:56 +01:00
Molkobain
97965277c7 N°6017 - Update OAuth dependencies 2023-02-23 15:57:32 +01:00
Pierre Goiffon
758933ae74 N°5849 use the new \utils::EscapedHtmlDecode method 2023-02-23 15:19:36 +01:00
Pierre Goiffon
f6a4cdbd8f Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-23 15:18:06 +01:00
Pierre Goiffon
93aee5883b N°6020 New \utils::EscapedHtmlDecode method 2023-02-23 15:17:46 +01:00
Molkobain
18ed5ed526 N°6019 - Increase PHP min version to 7.1.3 to enable dependencies update 2023-02-23 14:53:48 +01:00
Pierre Goiffon
93291454e5 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-23 12:05:55 +01:00
Pierre Goiffon
bbf6476570 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 2023-02-23 12:05:38 +01:00
Pierre Goiffon
94c4f8c929 N°6016 MissingDependencyException : better log message (#355) 
The error displayed on screen was already improved (see #280)
This commit improves the log message we can have for example by running unattended install.
 2023-02-23 12:04:56 +01:00
Pierre Goiffon
5e6ed950cb ReOrder LogChannels const 2023-02-23 11:55:31 +01:00
Pierre Goiffon
8ab459dfbc Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	core/log.class.inc.php
 2023-02-23 11:54:42 +01:00
Pierre Goiffon
d40cf7fe3b ReOrder LogChannels const 2023-02-23 11:52:19 +01:00
Pierre Goiffon
6997c0fd83 Merge remote-tracking branch 'origin/support/2.7' into support/3.0 
# Conflicts:
#	core/log.class.inc.php
 2023-02-23 11:47:49 +01:00
Pierre Goiffon
822922df5c N°5588 - Improve PDF export robustness when AttributeImage dimensions cannot be determined (#350) 
Can happen for example on SVG images
Now the export won't crash anymore, and we'll get a log (export channel, warning level) with  the object and attribute causing a problem as context

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
 2023-02-23 11:45:29 +01:00
Pierre Goiffon
d39ecb7406 Merge remote-tracking branch 'origin/support/3.0' into develop 2023-02-23 11:23:31 +01:00
Pierre Goiffon
cb2be0eccd N°5121 New AttributeURL validation use case 
In comment as it isn't handled yet
 2023-02-23 11:16:50 +01:00
Molkobain
26169111ed Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	css/backoffice/utils/helpers/_misc.scss
 2023-02-23 11:05:54 +01:00
Pierre Goiffon
f55fc8d264 N°6014 Validation pattern for URL : now handles commas in params (#356) 
Seen on PRTG URLs

Co-authored-by: Molkobain <lajarige.guillaume@free.fr>
 2023-02-23 10:59:38 +01:00
Molkobain
577f125a8d PHP 8.1: Fix trim() usage with a null value in Trigger 2023-02-23 10:40:29 +01:00
Molkobain
04269747b7 N°5920 - Increase delay before displaying tooltip 2023-02-23 10:17:30 +01:00
Molkobain
826fbe10c8 N°6002 - Explicitly add symfony/http-foundation and symfony/http-kernel to composer.json for easier lib update 2023-02-22 22:38:15 +01:00
Molkobain
ea2140258c N°5317 - Handle overlapping tables when table cells have fixed widths 2023-02-22 18:57:56 +01:00
Molkobain
d997e36de0 N°6002 - Update Symfony libs to 5.4.19 2023-02-22 18:19:56 +01:00
Molkobain
5ee603f2ba Merge remote-tracking branch 'origin/support/3.0' into develop 
# Conflicts:
#	datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
 2023-02-22 18:08:56 +01:00
Stephen Abello
31f2666941 Merge branch 'support/2.7' into support/3.0 
# Conflicts:
#	js/wizardhelper.js
 2023-02-22 15:46:13 +01:00
Stephen Abello
cac7e94a67 N°5729 - Fix disabled button in bulk update/transition when picking a value in a drop-down list 2023-02-22 15:42:20 +01:00
Pierre Goiffon
7925a5bd7e N°6013 Remove combodo-webhook-integration file 
Will be pushed in the corresponding module repo
 2023-02-22 15:28:26 +01:00
Molkobain
cd72eee6dd N°6013 - Update hungarian translations thanks to @tacsaby 2023-02-22 14:47:10 +01:00
Stephen Abello
da02a05fa3 Merge branch 'support/2.7' into support/3.0 2023-02-22 10:18:38 +01:00
Stephen Abello
6d019615d0 N°5865 - Restore DoCheckToWrite error messages in portal 2023-02-22 10:17:34 +01:00