Pierre Goiffon
ae95cf37f5
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-10-11 14:29:26 +02:00
Pierre Goiffon
85a72d6a10
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-10-11 14:29:07 +02:00
Pierre Goiffon
189ca3c555
🚚 Move visual test file to the dedicated directory
2022-10-11 14:28:44 +02:00
Molkobain
2e39a650eb
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-21 17:48:57 +02:00
Molkobain
c753b57265
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2022-09-21 16:23:42 +02:00
Molkobain
583ab98210
Fix typo
2022-09-21 16:11:24 +02:00
Pierre Goiffon
e4f6a02de6
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2022-09-21 14:28:25 +02: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
Pierre Goiffon
88d743b1cc
✅ N°5538 Make PHPUnit test fail if transaction opened but not closed
2022-09-21 14:05:27 +02:00
Pierre Goiffon
7ac4bc95bb
ItopDataTestCase : improve log message
2022-09-21 11:51:07 +02:00
odain
b01627f39d
Merge branch 'saas/3.0' into develop
2022-09-20 16:04:55 +02:00
odain-cbd
766c9f0e7e
N°5305 - CSV import ergonomy PR ( #332 )
...
Reworked UI feedbacks on following attributes:
- enum
- date
- external key
2022-09-20 16:00:33 +02:00
Eric Espie
4aad555649
N°4756 - Fix unit tests,
2022-09-20 12:18:53 +02:00
Eric Espie
93ee565d29
N°4756 - Fix unit tests
2022-09-19 16:59:51 +02:00
Eric Espie
6c097a128b
N°4756 - Fix unit tests
2022-09-19 16:49:40 +02:00
Eric Espie
eea3f78cec
N°4756 - Fix unit tests
2022-09-19 16:28:13 +02:00
Eric Espie
6c4caf64c8
N°4756 - Fix unit tests
2022-09-19 16:26:02 +02:00
Eric Espie
88f0013330
N°4756 - Fix unit tests
2022-09-19 16:09:02 +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
Eric Espie
e4e4365cce
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-13 12:18:09 +02:00
Eric Espie
425362f515
N°5510 - Add unit test
2022-09-13 12:14:04 +02:00
Pierre Goiffon
e6821f1d16
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-09-08 18:53:20 +02:00
Pierre Goiffon
56e7992d4a
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/ItopTestCase.php
2022-09-08 18:25:15 +02:00
Pierre Goiffon
74003f12c1
N°5513 Remove test name debug info
2022-09-08 18:20:52 +02:00
Pierre Goiffon
3bc12b0434
N°5513 Improve PHPUnit output to stdout
...
Will allow to see progress when looking at the Jenkins output
2022-09-08 15:11:02 +02:00
Pierre Goiffon
ef07f8366d
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-29 13:50:34 +02:00
Stephen Abello
bc7749602d
Merge branch 'support/3.0.2' into support/3.0
...
# Conflicts:
# setup/setup.js
2022-08-24 16:46:16 +02:00
Pierre Goiffon
06c3e295d6
Fix iTopXmlVersionIntegrationTest
...
* remove annotations for data tests : we are only comparing constants
* remove itop-community group : this test can be run whatever target was used to build
* remove wrong `@covers` annotation
2022-08-24 14:54:02 +02:00
Pierre Goiffon
6f438d52b2
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
...
# Conflicts:
# test/integration/iTopModulesPhpVersionChecklistTest.php
2022-08-24 14:46:55 +02:00
Pierre Goiffon
7a6a3d1ac0
Integration tests : move and comment itop-community group
2022-08-24 14:41:32 +02:00
odain
f923ac879f
ci: tag some tests with addition annotations to ease exclusion/inclusion mechanism
2022-08-24 12:07:04 +02:00
odain
0b46ab9e48
ci: add phpunit defaultProfiles annotation + tag some tests with addition annotations to ease exclusion/inclusion mechanism
2022-08-24 11:02:11 +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
Eric Espie
a577799fee
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-11 11:33:59 +02:00
odain-cbd
ec01ab73aa
N°5135 - Impersonate: history of changes versus log entries ( #290 )
...
* N°5135 - Impersonate: history of changes versus log entries
* N°5135 - enrich impersonated changelog userinfo with its previous value when overrided by an extension (ie approvalbase)
* N°5135 - indicate impersonation inside changelogs in both caselogs and activity
* N°5135 - Impersonate: history of changes versus log entries add specific username for caselogs
Co-authored-by: Eric Espie <eric.espie@combodo.com >
2022-08-11 11:12:07 +02:00
Molkobain
08387e2814
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-08-10 14:54:23 +02:00
Molkobain
62aaaabd7e
Update visual test comment
2022-08-10 14:53:42 +02:00
Stephen Abello
1f3e91efae
Merge branch 'support/3.0' into develop
2022-08-10 14:09:50 +02:00
Stephen Abello
77e9eaba00
Add highlighted rows to RenderAllUiBlocks
2022-08-10 14:07:38 +02:00
Eric Espie
952bceb3c3
Merge remote-tracking branch 'origin/support/3.0' into develop
...
# Conflicts:
# composer.json
# core/config.class.inc.php
# core/legacy/dbobjectsearchlegacy.class.php
# core/legacy/querybuildercontextlegacy.class.inc.php
# core/legacy/querybuilderexpressionslegacy.class.inc.php
# lib/composer/autoload_files.php
# lib/composer/autoload_static.php
2022-08-09 10:49:40 +02:00
Eric Espie
029e6114ad
N°4715 - Remove deprecated legacy SQL build
2022-08-09 10:41:46 +02:00
Molkobain
435dce91d7
Merge remote-tracking branch 'origin/support/3.0' into develop
2022-07-29 15:28:11 +02:00
Molkobain
614a586b4c
N°3129 - PHP 8.0: Fix unit test for which the tested error message as changed
2022-07-29 11:08:32 +02:00
acognet
7ec12f1e12
N°4517 - PHP 8.1: Replace htmlentities(***, ENT_QUOTES, 'UTF-8') with utils::EscapeHtml
2022-07-01 09:22:25 +02:00
Eric Espie
682ab44dea
Merge branch 'develop' into feature/faf_event_service
2022-06-30 14:22:52 +02:00
Benjamin Dalsass
977a8add67
Adjust php setup requirement to version 7.2.5.
...
Improve test error message.
2022-06-16 10:04:13 +02:00
Pierre Goiffon
abb13b70b9
Compiler : when generating model file add it to module ( #296 )
...
Before this fix, when creating a module for iTop that was creating PHP code (an iTop class for example, a snippet, ...) it was mandatory to add the model.php file in your module.php file ("datamodel" key). If you forgot this, then the compilation was completed OK but the result code wasn't included in iTop.
Now the compiler automatically adds the model.php file to the included files.
2022-06-15 18:07:16 +02:00
Eric Espie
6aef59e42d
Merge branch 'develop' into feature/faf_event_service
...
# Conflicts:
# core/dbobject.class.php
# datamodels/2.x/itop-config/config.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# lib/composer/installed.php
2022-06-08 16:51:44 +02:00
bdalsass
2b885beb82
Feature/merge 3 0 develop ( #298 )
...
* merging 3.0 into develop
* N°5102 - Allow to send emails (eg. notifications) using GSuite SMTP and OAuth
* migration to iTop 3.1
Co-authored-by: Eric Espie <eric.espie@combodo.com >
2022-06-08 16:27:20 +02:00
