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
Molkobain
078fc7bfb8
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-08 11:44:23 +01:00
Molkobain
d5a8a3bb09
N°4756 - Fix PHPDoc
2023-11-07 12:00:19 +01:00
jf-cbd
eaeb114754
N°6852 - Use "email_default_sender_address" when "forgot_password_from" config param is empty
2023-11-06 10:47:40 +01:00
Molkobain
a67d095c70
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-11-03 09:21:48 +01:00
Molkobain
cfd32581b7
N°6861 - Add PHPDoc and return type hint
2023-11-03 09:20:15 +01:00
vdumas
85a6bd0a05
Typo in EN Dictionary - Allowed orgs class name
2023-11-02 17:43:48 +01:00
Stephen Abello
92cd1e3f19
N°6861 - Display warning message when creating/editing a mandatory blob in modal depending on edition mode and blob value
2023-11-02 14:58:46 +01:00
Stephen Abello
647f43882b
Merge branch 'support/3.1' into develop
2023-11-02 11:21:47 +01:00
Stephen Abello
b54022e2ad
N°6385 - Move Linkset flags and edit_when logic from UIBlock to DisplayBareRelations
2023-11-02 10:16:35 +01:00
odain-cbd
eaa80c5396
N°6824 - Notification with current_contact placeholder trigger hundred of email sent ( #562 )
...
Co-authored-by: Molkobain <lajarige.guillaume@free.fr >
Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com >
Co-authored-by: Romain Quetiez <romain.quetiez@combodo.com >
2023-10-31 16:17:57 +01:00
Molkobain
ca47f5458c
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-31 16:15:03 +01:00
Molkobain
3aec6bff79
N°6866 - Fix regression from previous merge
2023-10-31 16:13:54 +01:00
Molkobain
3027bb5092
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-31 14:01:53 +01:00
Molkobain
83313ce1d5
N°6866 - Fix usages of hard-coded "listInObject" to \DisplayBlock::ENUM_STYLE_LIST_IN_OBJECT
2023-10-31 14:01:19 +01:00
Molkobain
893efa8e2d
Merge remote-tracking branch 'origin/support/3.1' into develop
2023-10-31 13:57:04 +01:00
Molkobain
8aa3dcdaa7
N°6866 - Fix regression from previous merge
2023-10-31 13:56:17 +01:00
