jf-cbd
684f829581
Merge commit from fork
2025-06-16 15:06:45 +02:00
Timothee
4590013adc
N°7581 Improve error message readability during object creation/modification in the portal (regression introduced with N°7545)
2024-06-21 12:48:43 +02:00
Timothee
a3a5630e88
N°7581 Improve error message readability during object creation/modification in the portal (regression introduced with N°7545)
2024-06-21 10:37:25 +02:00
Molkobain
ad36066126
📝 Copyright year bump
2024-05-06 18:35:31 +02:00
Pierre Goiffon
e3e8b25cfc
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# core/dbobject.class.php
# datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
# pages/UI.php
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
2023-11-15 15:31:56 +01:00
Pierre Goiffon
c955fe00b7
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# application/cmdbabstract.class.inc.php
# application/utils.inc.php
# core/coreexception.class.inc.php
# core/userrights.class.inc.php
# datamodels/2.x/itop-portal-base/portal/src/Form/ObjectFormManager.php
# tests/php-unit-tests/README.md
# tests/php-unit-tests/unitary-tests/core/DBObjectTest.php
2023-11-15 15:03:04 +01:00
Benjamin Dalsass
aa01003042
N°5916 - Generic message on Link Uniqueness rules
...
Replace space by non-breaking space
2023-05-03 12:48:33 +02:00
Molkobain
c767ebe989
📝 Copyright year bump
2023-03-17 18:28:47 +01:00
Molkobain
6fb00cbbf3
N°5388 - PHP 8.2: Fix dynamic properties to standard declared properties
2023-01-27 17:56:55 +01:00
Pierre Goiffon
8f6065d4f4
✅ ♻️ iTopDesignFormatTest : get version directly from expected content
2022-11-18 19:15:56 +01:00
Pierre Goiffon
a5b5518533
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# core/cmdbsource.class.inc.php
# test/core/CMDBSource/TransactionsTest.php
2022-09-21 14:21:28 +02:00
Molkobain
1441b8a1d2
N°5318 - Fix bad merge of the coreexception.class.inc.php file
2022-08-23 10:01:51 +02:00
Pierre Goiffon
5db8bd06ba
Merge remote-tracking branch 'origin/support/2.7' into develop
...
# Conflicts:
# core/cmdbsource.class.inc.php
# core/coreexception.class.inc.php
# core/log.class.inc.php
2021-06-21 16:24:27 +02:00
Pierre Goiffon
d8e2a1cc7c
Merge branch 'support/2.7' into develop
...
# Conflicts:
# README.md
# composer.json
# composer.lock
# core/cmdbsource.class.inc.php
# core/dbobject.class.php
# datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
# datamodels/2.x/combodo-db-tools/dbtools.php
# datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
# datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
# datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
# dictionaries/zh_cn.dictionary.itop.core.php
# dictionaries/zh_cn.dictionary.itop.ui.php
# lib/composer/InstalledVersions.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
# lib/composer/platform_check.php
# pages/ajax.render.php
# pages/csvimport.php
# setup/ajax.dataloader.php
# setup/index.php
# setup/setuputils.class.inc.php
# test/application/UtilsTest.php
2021-06-14 16:19:56 +02:00
Pierre Goiffon
e49b0db58d
N°3522 Handle twig errors nicely
...
Revert what was done in c5021721 : I then added a panel to be rendered instead of throwing an Exception. This was done because the exception was displayed in a blank page... But this was caused simply by a missing `use Exception` !!
So now we're back at throwing an exception, so that the standard mechanism for throwing the error page is triggered.
Handling Twig recursion is mandatory, and done in the beginning of the \Combodo\iTop\Application\TwigBase\Twig\TwigHelper::RenderTemplate catch block to avoid adding on each stack level a useless exception.
2021-03-11 15:20:41 +01:00
Pierre Goiffon
b85b4d0067
N°3663 Group exception classes in /application/exceptions
...
Original files kept for compatibility issues :
- core/coreexception.class.inc.php
There are remaining exceptions in /core/oql, but those files are generated
2021-01-26 15:50:26 +01:00