12887 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anne-Catherine	ed8d4df5ef	N°5786 - Problem with text color in public log and in AttributeHTML (#527) ... * N°5786 - Problem with text color in public log and in AttributeHTML	2023-10-17 12:09:52 +02:00
Pierre Goiffon	31a1370028	Merge branch 'support/3.1.0' into support/3.1 ... # Conflicts: # core/DbConnectionWrapper.php # tests/php-unit-tests/unitary-tests/core/CMDBSource/TransactionsTest.php	2023-10-17 11:13:29 +02:00
Pierre Goiffon	f36f3aa05b	💡 N°6848 Fix PHPDoc	2023-10-17 11:12:38 +02:00
Pierre Goiffon	d0d90d7c69	N°6848 Fix TransactionsTest::testTransactionOpenedNotClosed failing ... Was caused by 239c51bb, which adds 65bb76b9 tests improvements but only partly : we were missing in TransactionsTest::tearDown the mysqli reset from mock to original mysqli cnx Without this reset the rollback made in ItopTestCase::tearDown is throwing an exception (query() method on the DbConnectionWrapper cnx returns false in \CMDBSource::DBQuery) on PHP 8.1 and 8.2 Co-authored-by: Romain Quetiez <romain.queriez@combodo.com>	2023-10-17 10:53:26 +02:00
Stephen Abello	aa618468d1	Merge branch 'support/3.0' into support/3.1	2023-10-17 09:23:06 +02:00
Stephen Abello	fadfd94bac	Merge branch 'support/2.7' into support/3.0	2023-10-17 09:19:16 +02:00
Stephen Abello	9469681a0c	N°6777 - Security hardening	2023-10-17 09:12:40 +02:00
Pierre Goiffon	d4ab55dd9a	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # pages/ajax.render.php	2023-10-13 17:33:26 +02:00
Pierre Goiffon	da27ddba82	Merge remote-tracking branch 'origin/support/2.7' into support/3.0 ... # Conflicts: # application/utils.inc.php # pages/ajax.render.php	2023-10-13 17:27:03 +02:00
Pierre Goiffon	c72cb7e70e	N°6606 security hardening	2023-10-13 17:15:37 +02:00
Pierre Goiffon	9df92665e0	N°6606 Backport of utils::ENUM_SANITIZATION_FILTER_* constants ... Were introduced in 3.0.0, but not added to the support/2.7 branch	2023-10-13 17:10:35 +02:00
Molkobain	819baa3951	Merge remote-tracking branch 'origin/support/3.1.0' into support/3.1	2023-10-06 17:47:52 +02:00
Eric Espie	c78024394e	Better log of twig syntax errors	2023-10-06 15:25:27 +02:00
Eric Espie	4267f2b855	N°6747 - Customizing UserLDAP, generates presentation error messages in Designer during MTP	2023-10-06 09:53:26 +02:00
vdumas	ba8f18e1d4	N°6815 - DataModel : wrong attribute type for SLA.customercontracts_list	2023-10-05 18:08:46 +02:00
vdumas	ba13d24206	N°6814 - Datamodel remove lnkConnectableCIToNetworkDevice uniqueness rule	2023-10-05 18:08:46 +02:00
odain	239c51bb53	ci enhancement: complete tearDown to cleanup transactions and cmdb changes properly	2023-10-03 10:09:26 +02:00
Stephen Abello	ab3a4a2468	Merge branch 'support/3.0' into support/3.1 ... # Conflicts: # pages/ajax.render.php	2023-10-02 15:16:18 +02:00
Stephen Abello	3647291475	N°6778 - Security hardening	2023-10-02 15:06:17 +02:00
Molkobain	a472d83e3d	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # application/wizardhelper.class.inc.php # pages/ajax.render.php	2023-09-26 22:21:48 +02:00
Molkobain	6dc6392fab	Merge remote-tracking branch 'origin/support/3.0.3' into support/3.0	2023-09-26 22:20:02 +02:00
Anne-Catherine	e793b02f8b	N°6766 - Fix dependent fields not updated due to WizardHelper.UpdateFields() being triggered too early (#548) ... * N°6766 - Javascript : function WizardHelper.UpdateFields triggered to early does not update fields * N°6766 - Code review --------- Co-authored-by: Molkobain <lajarige.guillaume@free.fr>	2023-09-26 12:25:56 +02:00
Pierre Goiffon	c5cb84f976	N°6733 Fix some attributes impl not prompted in transitions when mandatory	2023-09-26 11:32:06 +02:00
Molkobain	12c0edc530	N°6547 - Fix flags init being an hard-coded int instead of the corresponding constant	2023-09-21 18:25:44 +02:00
Stephen Abello	61565b25a3	N°6767 - Error in ajax request when there's dict to load and no onready scripts	2023-09-21 10:40:22 +02:00
Pierre Goiffon	7619d055dd	N°6695 Handle multiline dict entries in portal tooltips (#542) ... Report Tippy fix from admin console (/css/backoffice/vendors/_tippy.scss) to user portal. Thanks DaveHeart for the bug report !	2023-09-20 18:10:56 +02:00
Molkobain	f01997f2ad	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2023-09-20 16:16:53 +02:00
Molkobain	fc6e98b534	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2023-09-20 16:12:51 +02:00
Molkobain	8ecebee511	✅ PHP unit tests: Fix typo for "final private" methods as they can't be both	2023-09-20 16:11:39 +02:00
Eric Espie	b5e26061e1	Merge branch 'issue/6667_trigger_on_state_enter' into support/3.1	2023-09-20 10:11:58 +02:00
Pierre Goiffon	14fa20b428	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # tests/ci_description.ini	2023-09-19 12:30:16 +02:00
Pierre Goiffon	2690fa3315	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2023-09-19 12:27:19 +02:00
Pierre Goiffon	35cd965360	N°6629 Update ci_description php_version	2023-09-19 12:25:40 +02:00
Pierre Goiffon	133fc29ad5	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2023-09-19 09:58:53 +02:00
Pierre Goiffon	83a5b98f82	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2023-09-19 09:58:40 +02:00
Pierre Goiffon	e5dd51f637	N°6600 Portal download attachment : don't display anymore SQL query on attachment not found error (#525)	2023-09-19 09:54:43 +02:00
Molkobain	2f6bcc3534	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2023-09-19 08:41:46 +02:00
Molkobain	4923418f58	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2023-09-19 08:39:41 +02:00
Molkobain	0a6c82dfe1	N°6752 - PHP unit tests: Fix typo in postbuild_integration.xml.dist	2023-09-19 08:37:46 +02:00
Molkobain	f89d843ab3	Merge remote-tracking branch 'origin/support/3.0' into support/3.1	2023-09-18 16:06:53 +02:00
Molkobain	2dd7f5cada	Merge remote-tracking branch 'origin/support/2.7' into support/3.0	2023-09-18 15:37:32 +02:00
Molkobain	24c0f4950f	Add missing .htaccess / web.config files in .gitignore for /extensions folder	2023-09-18 15:26:06 +02:00
Molkobain	d4dbbc59d4	N°6754 - PHP unit tests: Add local PHPUnit XML files to .gitignore	2023-09-18 15:23:52 +02:00
Molkobain	dc0cd44c79	N°6752 - PHP unit tests: Migrate usages of unitestautoload.php to composer autoloader	2023-09-18 15:14:44 +02:00
Pierre Goiffon	d7df249586	Merge remote-tracking branch 'origin/support/3.0' into support/3.1 ... # Conflicts: # application/ajaxwebpage.class.inc.php # application/capturewebpage.class.inc.php # application/clipage.class.inc.php # application/csvpage.class.inc.php # application/errorpage.class.inc.php # application/itopwebpage.class.inc.php # application/itopwizardwebpage.class.inc.php # application/nicewebpage.class.inc.php # application/pdfpage.class.inc.php # application/webpage.class.inc.php # application/xmlpage.class.inc.php	2023-09-18 15:10:19 +02:00
Pierre Goiffon	f3c4fcb0f5	💡 Pages files : add depreciation version	2023-09-18 15:07:32 +02:00
Pierre Goiffon	9a8e9a0b01	N°5491 Fix HU iTopUpdate:Error:MissingFile dict key	2023-09-18 08:45:45 +02:00
vdumas	f6a7e6b4e1	N°3506 - allow_target_creation based on UR_ACTION_MODIFY	2023-09-15 16:40:20 +02:00
Stephen Abello	2829fb291f	Update contribution stickers with 2023 design (better late than never 🙃)	2023-09-15 15:43:50 +02:00
odain	6110abfc7f	Merge branch 'support/3.0' into support/3.1	2023-09-15 10:08:37 +02:00