Pierre Goiffon
87bb3d17a9
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-21 18:10:11 +01:00
Pierre Goiffon
cfe73699cf
N°6967 Deprecate DBDeleteTracked_Internal methods
2023-11-21 18:05:29 +01:00
Pierre Goiffon
fa830bdd7f
N°6966 Deprecate DBCloneTracked and DBCloneTracked_Internal methods
2023-11-21 18:04:05 +01:00
Pierre Goiffon
33596249a1
N°6973 Fix composer platform check
2023-11-21 11:03:58 +01:00
Pierre Goiffon
26beeb6a80
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-21 11:02:28 +01:00
Pierre Goiffon
2c1df77f4d
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-21 11:01:31 +01:00
Pierre Goiffon
3068a6a360
N°6951 Fix autoloader
2023-11-21 11:01:16 +01:00
Stephen Abello
982b3aa5f3
Merge branch 'support/3.1' into develop
...
# Conflicts:
# dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php
# dictionaries/zh_cn.dictionary.itop.core.php
2023-11-21 10:26:15 +01:00
Stephen Abello
47e7c35c2b
Merge branch 'support/3.0' into support/3.1
...
# Conflicts:
# dictionaries/cs.dictionary.itop.core.php
# dictionaries/da.dictionary.itop.core.php
# dictionaries/de.dictionary.itop.core.php
# dictionaries/es_cr.dictionary.itop.core.php
# dictionaries/hu.dictionary.itop.core.php
# dictionaries/it.dictionary.itop.core.php
# dictionaries/ja.dictionary.itop.core.php
# dictionaries/nl.dictionary.itop.core.php
# dictionaries/pl.dictionary.itop.core.php
# dictionaries/pt_br.dictionary.itop.core.php
# dictionaries/ru.dictionary.itop.core.php
# dictionaries/sk.dictionary.itop.core.php
# dictionaries/tr.dictionary.itop.core.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_static.php
# sources/Application/Helper/ExportHelper.php
2023-11-21 10:24:29 +01:00
Stephen Abello
083a0b79bf
N°6951 - Security hardening
2023-11-21 10:08:46 +01:00
Stephen Abello
e22220b4fe
Merge branch 'support/2.7' into support/3.0
...
# Conflicts:
# core/csvbulkexport.class.inc.php
# core/excelbulkexport.class.inc.php
# lib/composer/autoload_classmap.php
# lib/composer/autoload_files.php
# lib/composer/autoload_real.php
# lib/composer/autoload_static.php
2023-11-21 09:47:14 +01:00
Stephen Abello
b10bcb976d
N°6951 - Security hardening
2023-11-21 09:42:11 +01:00
Pierre Goiffon
8e179f0563
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-21 09:25:35 +01:00
Pierre Goiffon
a2181b3478
Merge remote-tracking branch 'origin/support/3.0' into support/3.1
2023-11-21 09:25:21 +01:00
Pierre Goiffon
154a20b757
💡 Fix ItopCustomDatamodelTestCase since phpdoc
...
See https://docs.phpdoc.org/guide/references/phpdoc/tags/since.html#since
2023-11-21 09:21:30 +01:00
Pierre Goiffon
79c24dfc96
N°6975 Fix ItopCustomDatamodelTestCase removing symlinks flag ( #574 )
2023-11-21 09:20:11 +01:00
Molkobain
95e0f02cae
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-20 15:55:52 +01:00
Benjamin Dalsass
c0b1e877ad
Upgrade PHP min version to 8.1.0
2023-11-20 15:21:00 +01:00
Molkobain
403c369ea0
N°6963 - Update comment
2023-11-20 09:20:09 +01:00
Molkobain
d5875047fa
N°6963 - Update PHP min version prerequisite (8.1) for next iTop version (3.2.0)
2023-11-17 10:25:22 +01:00
Molkobain
444c9e0589
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-17 08:50:26 +01:00
Molkobain
6955f74c97
N°5281 - Fix methods name case
2023-11-17 08:48:51 +01:00
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
