Molkobain
fb0f692c73
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-16 16:34:30 +01:00
Molkobain
6bf9ce3237
Merge remote-tracking branch 'origin/release/designer-lot-3' into support/3.1
2023-11-16 16:33:17 +01:00
Molkobain
5726f9f81a
N°6960 - Fix \MFDocument::GetNodes() adding a predicate on last expression only instead of the whole XPath
2023-11-16 16:31:47 +01:00
Pierre Goiffon
90a0e50e75
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-16 16:18:22 +01:00
Pierre Goiffon
be93b41363
✅ N°6458 Fix failing tests due to ItopDataTestCase modifications
2023-11-16 15:43:11 +01:00
Pierre Goiffon
d33d82bcd8
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-16 15:35:52 +01:00
Pierre Goiffon
b9d960e89e
✅ N°6458 Fix ItopDataTestCase::$bIsUsingSilo visibility
2023-11-16 15:35:04 +01:00
Pierre Goiffon
8540ec644a
✅ N°6458 Improve ItopDataTestCase tests speed
...
What was measured :
- 1'54 with previous code (always doing a reset in tearDown)
- 1'44 without any ResetMetaModelQueyCacheGetObject call (but 3 tests are failing)
- 1'44 with new optin mechanism + don't call Logoff if no current user logged
2023-11-16 15:23:18 +01:00
Pierre Goiffon
5b19593ede
📝 README tests : add prerequisites
2023-11-16 14:38:15 +01:00
Pierre Goiffon
ad0795da02
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-16 12:07:19 +01:00
Pierre Goiffon
57b70e48bd
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-16 12:02:20 +01:00
Pierre Goiffon
0915081f50
✅ ItopDataTestCase fix cached SQL queries with silo
2023-11-16 11:57:29 +01:00
Pierre Goiffon
7798df0d53
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
...
# Conflicts:
# tests/php-unit-tests/src/BaseTestCase/ItopDataTestCase.php
2023-11-16 11:29:31 +01:00
Pierre Goiffon
a23d629e31
✅ ItopDataTestCase fix using non existing EventService (added in 3.1.0)
2023-11-16 11:23:07 +01:00
Pierre Goiffon
47ccd7589f
✅ Fix TriggerTest relying on hardcoded admin user id
2023-11-16 11:16:59 +01:00
Pierre Goiffon
7521fc3006
✅ N°6458 Tests : remove processIsolation
...
Was caused by cached User instances in UserRights + same login for each created User objects instances
2023-11-16 10:56:47 +01:00
Pierre Goiffon
65674b9cc4
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-16 10:40:01 +01:00
Pierre Goiffon
8f61c02cbe
N°6458 Fix portal errors
2023-11-16 09:23:19 +01:00
Pierre Goiffon
ad0fa6636b
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-15 15:47:24 +01: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
Pierre Goiffon
5a43448644
N°6458 Security hardening
2023-11-15 11:14:07 +01:00
jkoch22
67650012ce
N°6954 - Update english translations thanks to @jkoch22 ( #554 )
...
Correct incorrect translation
2023-11-14 17:25:47 +01:00
Molkobain
d00137026a
👥 Add @bdejin to contributors list! 🙌
2023-11-14 17:19:54 +01:00
Devin
12a1321bc1
N°6907 - Update chinese translations thanks to @bdejin ( #563 )
...
* Add missing translations
* add missing translation
* minor update on translation "see setting
* add missing translations
* add missing translation for file dictionaries\zh_cn.dictionary.itop.core.php
* add missing translation for file dictionaries\zh_cn.dictionary.itop.ui.php
* add missing translation for file dictionaries\zh_cn.dictionary.itop.ui.php
* added missing translation for core and ui
* added missing translation for the rest files
* 🌐 minor Chinese translation updates following comments from chileeb on PR #563
* 🌐 update most of the 'class' translation from '类' to '类型'
* 🌐 add kitty message translation
* 🌐 update '表格中暂无数据' in dictionaries\ui\components\datatable\zh_cn.dictionary.itop.datatable.php to '当前列表没有数据'
2023-11-14 17:16:09 +01:00
Pierre Goiffon
c41ecb1b9d
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-13 16:28:34 +01:00
Pierre Goiffon
f5a0b4bf8e
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-13 16:27:34 +01:00
Pierre Goiffon
a2b9583379
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-11-13 16:25:53 +01:00
Pierre Goiffon
77409eed99
🎨 DBObject small phpdoc fixes
2023-11-13 16:25:37 +01:00
Molkobain
770bf4c42a
Merge remote-tracking branch 'origin/support/3.1' into develop
...
# Conflicts:
# sources/Service/Events/EventService.php
2023-11-13 15:24:47 +01:00
Molkobain
eb7c971091
N°6948 - Upgrade "symfony/twig-bridge" to v5.4.31
2023-11-13 15:17:52 +01:00
Eric Espie
4d5a704d9a
N°6062 - ✅ Fix unit tests
2023-11-13 15:14:29 +01:00
Eric Espie
b758113752
N°6436 - Integrate Performance Audit pre requisite (log events for extensions)
2023-11-13 15:02:54 +01:00
Molkobain
d5f054b739
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-13 13:38:25 +01:00
Stephen Abello
5465287089
Merge branch 'support/3.0' into support/3.1
2023-11-13 11:21:21 +01:00
Stephen Abello
09be84f69d
N°6908 - Security hardening
2023-11-13 11:19:02 +01:00
Romain Quetiez
473c4cf3fa
✅ N°6658 - Reset the "current user" status (defensive programming)
2023-11-10 16:33:56 +01:00
Romain Quetiez
347156f900
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-10 16:30:22 +01:00
Romain Quetiez
3b987f97eb
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-10 16:15:08 +01:00
Romain Quetiez
d9bdcfeae3
✅ N°6658 - Fix regression: do not reset current user's profile cache
2023-11-10 15:57:08 +01:00
Pierre Goiffon
76b70684cd
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-10 15:21:30 +01:00
Pierre Goiffon
8df7c22464
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-10 15:21:10 +01:00
Pierre Goiffon
d725ba3d84
N°6765 Avoid behat scenario loading issues on portal modal ( #569 )
...
- New CombodoJsActivity API
- Replace existing calls in NiceWebPage (ready scripts)
- Add calls in ready block in portal object create template (used in both create and edit)
2023-11-10 15:10:37 +01:00
Molkobain
336b5da2a7
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-09 18:24:30 +01:00
Molkobain
2d8ecd465b
N°6903 - Fix crash when emptying file attribute (eg. picture of a contact)
2023-11-09 18:17:35 +01:00
Molkobain
34ba4fa0ce
N°6917 - Security hardening
2023-11-09 16:43:37 +01:00
Molkobain
6f39ae5d76
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-08 15:01:42 +01:00
Molkobain
08d22219f4
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-08 14:59:56 +01:00
Molkobain
8a3d81c430
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
2023-11-08 14:59:06 +01:00
Anne-Catherine
83a70daf68
N°6887 - Fix excessive OQL requests to display user's grant matrix ( #564 )
...
* N°6887 - Fix excessive OQL requests to display user's grant matrix
* N°6887 - Rename variable and add PHPDoc
---------
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
2023-11-08 14:57:28 +01:00
