Skip to content

Commit 63bbcb4

Browse files
committed
Merge branch 'rel-11_1' into issue-#4432-cleanup_znunyhelper_v2
2 parents 4a4c15b + 9c9c1ce commit 63bbcb4

805 files changed

Lines changed: 140514 additions & 43657 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
cpanfile.docker.snapshot merge=ours
2+
CHANGES.md merge=ours
3+
i18n/** merge=ours
4+
Kernel/Language/** merge=ours

.github/workflows/docker_image_update_autobuild.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,19 @@ jobs:
6262
'latest-11_0-autobuild'
6363
]
6464
include:
65-
# the latest release for every release branch - has to be updated
65+
66+
# The branch with the latest patch level release for every release series. This is
67+
# irrespective of the target.
68+
# Has to be updated for every new patch level release.
6669
-
67-
docker_tag: 'latest-10_0-autobuild'
68-
patch: 'rel-10_0_26'
70+
docker_tag: 'latest-10_0-autobuild'
71+
otobo_branch: 'rel-10_0_27'
6972
-
70-
docker_tag: 'latest-10_1-autobuild'
71-
patch: 'rel-10_1_15'
73+
docker_tag: 'latest-10_1-autobuild'
74+
otobo_branch: 'rel-10_1_16'
7275
-
73-
docker_tag: 'latest-11_0-autobuild'
74-
patch: 'rel-11_0_12'
76+
docker_tag: 'latest-11_0-autobuild'
77+
otobo_branch: 'rel-11_0_13'
7578

7679
# otobo-nginx-kerberos-webproxy uses different dockerfiles in 10.0 and 10.1
7780
-
@@ -121,11 +124,11 @@ jobs:
121124
# These variables can be accessed in the env context
122125
name: Setting up the environment file (autobuild)
123126
run: |
124-
patch=${{ matrix.patch }}
127+
otobo_branch=${{ matrix.otobo_branch }}
125128
docker_tag=${{ matrix.docker_tag }}
126129
build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
127130
(
128-
echo "otobo_branch=${patch}"
131+
echo "otobo_branch=${otobo_branch}"
129132
echo "otobo_docker_tag=${docker_tag}"
130133
echo "otobo_ref=${{ matrix.repository }}:${docker_tag}"
131134
echo "otobo_base_image=${{ matrix.base_image }}"
@@ -253,14 +256,15 @@ jobs:
253256
title: 'Issue created by the Github action DockerImageUpdateAutobuild',
254257
body: `
255258
The Github workflow DockerImageUpdateAutobuild has found that
256-
the base image of ${{ steps.count_builds.outputs.num_builds }} autobuild Docker image has changed.
259+
the base image of ${{ steps.count_builds.outputs.num_builds }} autobuild Docker images has changed.
257260
258261
This means that there is work to do. Please test the newly created Docker images.
259262
This can be done via the 'New Pipeline' button in https://git.otobo.org/otobo/otobo/-/pipelines .
263+
Choose 'autobuild' for the variable OTOBO_DOCKER_DEVEL.
260264
261-
Note that the GitLab pipeline tests do not cover the service nginx. For sanity testing nginx
262-
please pull the autobuild images, start an installation with the autobuild images and see whether
263-
OTOBO can be accessed via HTTPS.
265+
Note that the GitLab pipeline tests do not cover the service nginx. Please do manual sanity testing.
266+
First pull current images with 'docker compose pull'. Then start an installation with the autobuild images
267+
and see whether OTOBO can be accessed via HTTPS.
264268
265269
Rebuild the released Docker images when things look fine. The rebuild can be done
266270
via the Github action DockerImageUpdateAll.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,6 @@ Test
122122
*.csr
123123
*.key
124124
*.pem
125+
126+
# files created by PackagePrep script
127+
*.pp_backup

CHANGES.md

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,126 @@
11

2+
# OTOBO 11.0.14 2025-12-17
3+
- 2025-12-17 10:39:25 +0100 Create new OTOBO language files.
4+
- 2025-12-16 18:52:02 +0100 Install Perl modules from https://cpan.metacpan.org when building Docker images (https://github.com/RotherOSS/otobo/issues/4953)
5+
- 2025-12-16 12:56:00 +0000 Heading styles differ in CK5 and in article. (https://github.com/RotherOSS/otobo/issues/4816)
6+
- 2025-12-16 11:19:01 +0000 [Changed] Let CKEditor5 generate hex instead of HSL color CSS styles (https://github.com/RotherOSS/otobo/issues/4766)
7+
- 2025-12-16 07:58:57 +0100 AdminAutoResponse: Review overview button layout (https://github.com/RotherOSS/otobo/issues/3597)
8+
- 2025-12-15 16:34:52 +0100 Make the test CPANAudit.t more stringent (https://github.com/RotherOSS/otobo/issues/4877)
9+
- 2025-12-15 15:22:47 +0100 Update the CPAN snapshot
10+
- 2025-12-15 15:16:58 +0100 Update the CPAN snapshot
11+
- 2025-12-15 15:05:44 +0100 Update the CPAN snapshot
12+
- 2025-12-15 11:50:51 +0000 Update jquery-validate to version 1.21.0 (https://github.com/RotherOSS/otobo/issues/4934)
13+
- 2025-12-15 12:48:24 +0100 A couple of minor changes in Kernel::System::Environment
14+
- 2025-12-15 12:38:12 +0100 Update CPAN::Audit to 20250829.001 and CPANSA::DB to 20251214.001 (https://github.com/RotherOSS/otobo/issues/4941)
15+
- 2025-12-15 11:53:35 +0100 [Bugfix] Modification of texts using otobo translation tool (https://github.com/RotherOSS/otobo/issues/4664)
16+
- 2025-12-15 09:27:50 +0000 Update nunjucks to version 3.2.4 (https://github.com/RotherOSS/otobo/issues/4933)
17+
- 2025-12-12 14:27:00 +0100 Improve the documentation of Kernel::System::EventHandler (https://github.com/RotherOSS/otobo/issues/4867)
18+
- 2025-12-10 14:06:44 +0000 Update CKEditor to 47.3.0 (https://github.com/RotherOSS/otobo/issues/4906)
19+
- 2025-12-10 15:09:23 +0100 Leftovers of orange in the system (https://github.com/RotherOSS/otobo/issues/4888)
20+
- 2025-12-10 14:34:24 +0100 Long DynamicField Title text is being cut off in AgentTicketPhone (https://github.com/RotherOSS/otobo/issues/4755)
21+
- 2025-12-10 08:27:34 +0000 Update Codemirror to version 5.65.20 (https://github.com/RotherOSS/otobo/issues/4918)
22+
- 2025-12-10 11:22:41 +0100 Fix slightly unusually formatted phone number in installer.pl (https://github.com/RotherOSS/otobo/issues/4922)
23+
- 2025-12-10 09:51:43 +0100 Not everything shown in High Contrast Skin (https://github.com/RotherOSS/otobo/issues/3700)
24+
- 2025-12-10 09:45:10 +0100 [Bugfix] Missing Delete Filter Icon in High-Contrast Skin (https://github.com/RotherOSS/otobo/issues/4899)
25+
- 2025-12-10 08:52:03 +0100 Check if ObjectType of Set-inner dynamic fields is the same as ObjectType of the Set dynamic field itself (https://github.com/RotherOSS/otobo/issues/4893)
26+
- 2025-12-10 08:29:15 +0100 Corrected dymamic to dynamic.
27+
- 2025-12-10 08:26:51 +0100 Corrected dymamic to dynamic.
28+
- 2025-12-09 09:21:40 +0100 [Bugfix] prevent AgentTIcketZoom Selenium test from failing (https://github.com/RotherOSS/otobo/issues/4904)
29+
- 2025-12-09 15:58:53 +0100 Start using Test2::V0 in a test script
30+
- 2025-12-09 11:40:13 +0100 Elaborate on how to test the autobuild images.
31+
- 2025-12-08 18:29:04 +0100 Update the CPAN snapshot
32+
- 2025-12-08 18:24:39 +0100 [Bugfix] Printing Tickets with Unicode codepoints outside basic multilingual plane (https://github.com/RotherOSS/otobo/issues/1848) - in progress
33+
- 2025-12-08 11:12:10 +0100 Enhance a code comment.
34+
- 2025-12-05 13:00:25 +0100 stabilize FieldRestrictions/GetFieldStates.t (https://github.com/RotherOSS/otobo/issues/4897)
35+
- 2025-12-05 17:30:42 +0100 Steal some changes and fixes from rel-11_1
36+
- 2025-12-05 16:45:04 +0100 Accept suggestions from CodePolicy
37+
- 2025-12-05 16:41:58 +0100 Rename the variable $ReConfigure to $ReConfigureFailed
38+
- 2025-12-05 16:30:59 +0100 Enhance the POD of the layout object
39+
- 2025-12-05 15:06:37 +0100 Convert a test script to Test2::V0
40+
- 2025-12-04 18:10:45 +0100 [Enhanced] New Transitionaction: TicketPrioritySet (https://github.com/RotherOSS/otobo/issues/4896)
41+
- 2025-11-13 09:22:32 +0100 Clarify enhanced mode description in XML
42+
- 2025-12-02 14:35:21 +0000 Fix reports with graphs in reports for the default docker environment. (https://github.com/RotherOSS/otobo/issues/4890)
43+
- 2025-12-04 09:26:09 +0100 [Bugfix] Calendars Can Only Be Configured of Group Members; implemented this as LightAdmin functionality, allowed all Groups for Admin. (https://github.com/RotherOSS/otobo/issues/4724)
44+
- 2025-12-03 12:12:01 +0100 [Bugfix] Useless history entries are created for dynamic fields under certain circumstances (https://github.com/RotherOSS/otobo/issues/4794)
45+
- 2025-12-03 11:06:51 +0100 Modernize the test script Stats/StatsRun.t
46+
- 2025-12-03 08:38:34 +0100 Prevent some warnings around lens fields for empty references. (https://github.com/RotherOSS/otobo/issues/4892)
47+
- 2025-12-03 08:33:05 +0100 [Enhanced] Accept ticket reference fields to define TicketID in transition action DynamicFieldSet. (https://github.com/RotherOSS/otobo/issues/4818)
48+
- 2025-12-02 18:13:26 +0100 Accept suggestions from CodePolicy in test script
49+
- 2025-12-02 18:11:36 +0100 Do not needlessly use subroutine references in the test script
50+
- 2025-12-02 18:06:28 +0100 Use Test2::Require::OTOBO::Selenium in test script
51+
- 2025-12-02 18:02:59 +0100 Convert a test script to Test2::V0
52+
- 2025-12-02 17:11:49 +0100 Use Test2::Require::OTOBO::Selenium
53+
- 2025-12-02 17:02:48 +0100 Convert a test script to Test2::V0
54+
- 2025-12-02 16:57:12 +0100 Add a comment stating that there might be a sporadic failure
55+
- 2025-12-02 10:40:03 +0100 [Bugfix] Dynamic fields with namespaces cannot be used as filter in statistics. (https://github.com/RotherOSS/otobo/issues/4844)
56+
- 2025-12-01 18:18:15 +0100 Upgrade Chrome Selenium docker container (https://github.com/RotherOSS/otobo/issues/4839)
57+
- 2025-11-14 18:05:00 +0100 Revert "Issue #4839: attempt to stabilize AgentTickentEventLockAfterCreate.t"
58+
- 2025-12-01 14:27:37 +0100 Do not check for Perl core module in otobo.CheckModules.pl (https://github.com/RotherOSS/otobo/issues/4376)
59+
- 2025-11-28 11:41:24 +0100 [Bugfix] Fix MultiValue Set templates in CustomerTicketProcess (https://github.com/RotherOSS/otobo/issues/4886)
60+
- 2025-11-28 12:02:29 +0100 Update the CPAN snapshot
61+
- 2025-11-28 11:36:39 +0100 Update the CPAN snapshot
62+
- 2025-11-27 16:24:10 +0100 [Bugfix] Prevent uninitialized value warning, when switching from single value to multi value in previously used DFs. (https://github.com/RotherOSS/otobo/issues/4884)
63+
- 2025-11-26 11:53:33 +0100 Include the Perl module Encode::HanExtra in the Docker image (https://github.com/RotherOSS/otobo/issues/4881)
64+
- 2025-11-25 18:05:07 +0100 [Tidied] Investigate warning in AdminState (https://github.com/RotherOSS/otobo/issues/4535)
65+
- 2025-11-25 13:52:39 +0000 Translated using Weblate (French)
66+
- 2025-11-21 13:44:49 +0100 [Bugfix] AJAX Update for Set fields not working in CustomerTicketProcess (https://github.com/RotherOSS/otobo/issues/4868)
67+
- 2025-11-21 12:17:33 +0100 Accept formatting suggested by CodePolicy for 10.1.x
68+
- 2025-11-20 14:32:13 +0100 Corrected duplicate word and mainstreamed expression.
69+
- 2025-11-20 18:22:33 +0100 Eliminate another duplicated 'the'.
70+
- 2025-11-20 18:20:55 +0100 Clean up misspellings where the word 'the' was duplicated
71+
- 2025-11-20 14:36:16 +0100 Fixed typo.
72+
- 2025-11-20 18:03:49 +0100 'conformant' is not an English word
73+
- 2025-11-20 17:18:14 +0100 bin/otobo.CheckModules.pl should not depend on namespace::autoclean (https://github.com/RotherOSS/otobo/issues/4864)
74+
- 2025-11-19 11:12:59 +0100 Added 'Template' as index when rendering multivalue Set.
75+
- 2025-11-18 14:31:12 +0100 Fix Javascript CodePolicy warnings (https://github.com/RotherOSS/otobo/issues/4824) - in progress
76+
- 2025-11-18 07:58:39 +0100 Add pp_backup to gitignore file (https://github.com/RotherOSS/otobo/issues/4847)
77+
- 2025-11-17 12:08:52 +0100 Update the CPAN snapshot file
78+
- 2025-11-17 11:14:35 +0000 Upgrade CKEditor 5 to newest version (https://github.com/RotherOSS/otobo/issues/4173)
79+
- 2025-11-13 14:57:44 +0100 No need to check for the requirement Net::SMTP (https://github.com/RotherOSS/otobo/issues/4836)
80+
- 2025-11-13 14:03:06 +0100 Simplify setup of %IsStandardFeature and %IsDockerFeature in bin/otobo.CheckModules.pl (https://github.com/RotherOSS/otobo/issues/4834)
81+
- 2025-11-13 13:29:15 +0100 Update the CPAN snapshot file
82+
- 2025-11-13 13:17:56 +0100 Update the CPAN snapshot file
83+
- 2025-11-13 08:13:56 +0100 Improve POD of dynamic field backend modules (https://github.com/RotherOSS/otobo/issues/4820)
84+
- 2025-11-12 16:23:47 +0100 Enhance the POD for CustomerUserDataGet()
85+
- 2025-11-12 14:51:15 +0100 Think about merge strategy for CHANGES.md and the translation files (https://github.com/RotherOSS/otobo/issues/4731)
86+
- 2025-11-12 14:29:45 +0100 [Tidied] Clean up InitialRun-related code (https://github.com/RotherOSS/otobo/issues/4826)
87+
- 2025-11-12 14:20:02 +0100 [Bugfix] Add missing InitialRun reset in CustomerTicketMessage (https://github.com/RotherOSS/otobo/issues/4827)
88+
- 2025-11-12 08:14:10 +0000 Issue: #4824 Update references to ESLint rule otobo/no-window
89+
- 2025-11-10 09:15:57 +0000 Translated using Weblate (Arabic (Saudi Arabia))
90+
- 2025-11-10 09:14:03 +0100 [Bugfix] Ticket event TicketDynamicFieldDefault does not actually prevent multiple execution (https://github.com/RotherOSS/otobo/issues/4809)
91+
- 2025-11-10 09:12:44 +0100 Revert "Issue #4809: Added missing cache key filling."
92+
- 2025-11-06 22:12:28 +0100 Format a line to look like the line above
93+
- 2025-11-06 15:39:24 +0100 Removed overlooked comment.
94+
- 2025-11-06 12:32:03 +0100 [Enhanced] assign Elasticsearch search-box an accesskey (https://github.com/RotherOSS/otobo/issues/4810)
95+
- 2025-11-04 08:31:23 +0100 Removed obsolete TODO comment in BaseText driver.
96+
- 2025-11-03 09:17:26 +0000 adapt emailparser/multipartmixed test to recent css change
97+
- 2025-10-31 11:28:23 +0000 Translated using Weblate (Czech)
98+
- 2025-10-30 10:54:26 +0000 [Changed] Change default styling of tables in RichText (https://github.com/RotherOSS/otobo/issues/4800)
99+
- 2025-10-30 14:37:38 +0100 [Bugfix] For AgentTicketMerge where the sender is unknown, the senders address, the ticket system is used as salutation (https://github.com/RotherOSS/otobo/issues/1902)
100+
- 2025-10-30 14:06:36 +0100 Revert "Issue #1902: Switched 'To' to 'From'."
101+
- 2025-10-29 11:42:59 +0100 Rename the attribute 'patch' with 'otobo_branch'.
102+
- 2025-10-29 11:32:08 +0100 Update the branch to be used for the autobuild check
103+
- 2025-10-29 08:47:39 +0100 [Bugfix] Do not hardcode default skin for CSS creation in Login mask rendering (https://github.com/RotherOSS/otobo/issues/4797)
104+
- 2025-10-15 13:05:45 +0200 Update AdminQueue.tt
105+
- 2025-10-26 13:13:55 +0100 Update the CPAN snapshot file:
106+
- 2025-10-26 12:44:41 +0100 Update the CPAN snapshot file
107+
- 2025-10-24 17:10:14 +0200 Fix spelling in excluded Docker image
108+
- 2025-10-24 17:02:41 +0200 Fix another spelling error:
109+
- 2025-10-24 16:51:16 +0200 Do not include configurations that were explicitly excluded
110+
- 2025-10-24 16:42:51 +0200 Fix tag name in exclude block
111+
- 2025-10-24 16:40:55 +0200 Remove trailing commas
112+
- 2025-10-24 16:35:12 +0200 Exclude the two versions of Nginx before the latest
113+
- 2025-10-24 16:23:44 +0200 'fix_cldr' is no longer needed
114+
- 2025-10-24 16:18:08 +0200 Adapt to pinned Debian version of the Nginx base image
115+
- 2025-10-24 16:17:40 +0200 Adapt to new patchlevel releases
116+
- 2025-10-24 15:59:07 +0200 Revert "Issue #4752: Exclude the nginx Docker images"
117+
- 2025-10-23 15:07:29 +0200 Remove erroneously references issues from CHANGES.
118+
- 2025-10-23 14:57:13 +0200 Update CHANGES.
119+
- 2025-10-23 14:55:19 +0200 Create new OTOBO language files.
120+
- 2025-10-23 14:48:30 +0200 Update CHANGES.
121+
- 2025-09-25 10:05:44 +0200 Update translation files
122+
123+
2124
# OTOBO 11.0.13 2025-10-23
3125
- 2025-10-23 15:05:23 +0200 Create new OTOBO language files.
4126
- 2025-10-16 13:31:22 +0100 [Enhanced] invalid input in Autocomplete reference fields should be removed (https://github.com/RotherOSS/otobo/issues/4774)
@@ -2802,3 +2924,5 @@
28022924

28032925

28042926

2927+
2928+

Kernel/Config.pm.docker.dist

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ sub Load {
138138
$Self->{'Cache::Redis'}->{'Server'} = 'redis:6379';
139139
$Self->{'TestHTTPHostname'} = 'web:5000';
140140

141-
# ---------------------------------------------------- #
142-
# activate Selenium tests if the the host is available #
143-
# ---------------------------------------------------- #
141+
# -------------------------------------------------#
142+
# activate Selenium tests if the host is available #
143+
# -------------------------------------------------#
144144
$Self->{'SeleniumTestsConfig'} = {
145145
remote_server_addr => 'selenium-chrome',
146146
check_server_addr => 1, # skip test when remote_server_addr can't be resolved via DNS

Kernel/Config/Defaults.pm

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1109,11 +1109,11 @@ sub LoadDefaults {
11091109
$Self->{'Loader::Customer::CommonJS'}->{'000-Framework'} = [
11101110
'thirdparty/jquery-3.7.1/jquery.min.js',
11111111
'thirdparty/jquery-browser-detection/jquery-browser-detection.js',
1112-
'thirdparty/jquery-validate-1.19.3/jquery.validate.js',
1112+
'thirdparty/jquery-validate-1.21.0/jquery.validate.min.js',
11131113
'thirdparty/jquery-ui-1.13.2/jquery-ui.min.js',
11141114
'thirdparty/jquery-pubsub/pubsub.js',
11151115
'thirdparty/jquery-jstree-3.3.7/jquery.jstree.js',
1116-
'thirdparty/nunjucks-3.2.2/nunjucks.min.js',
1116+
'thirdparty/nunjucks-3.2.4/nunjucks.min.js',
11171117
'Core.Init.js',
11181118
'Core.Debug.js',
11191119
'Core.Exception.js',
@@ -1152,10 +1152,10 @@ sub LoadDefaults {
11521152
'thirdparty/jquery-browser-detection/jquery-browser-detection.js',
11531153
'thirdparty/jquery-ui-1.13.2/jquery-ui.min.js',
11541154
'thirdparty/jquery-ui-touch-punch-0.2.3/jquery.ui.touch-punch.js',
1155-
'thirdparty/jquery-validate-1.19.3/jquery.validate.js',
1155+
'thirdparty/jquery-validate-1.21.0/jquery.validate.min.js',
11561156
'thirdparty/jquery-pubsub/pubsub.js',
11571157
'thirdparty/jquery-jstree-3.3.7/jquery.jstree.js',
1158-
'thirdparty/nunjucks-3.2.2/nunjucks.min.js',
1158+
'thirdparty/nunjucks-3.2.4/nunjucks.min.js',
11591159
'Core.Init.js',
11601160
'Core.JavaScriptEnhancements.js',
11611161
'Core.Debug.js',
@@ -2184,7 +2184,8 @@ sub new {
21842184
# load default settings from Kernel/Config/Defaults.pm
21852185
$Self->LoadDefaults();
21862186

2187-
# load specific settings from Kernel/Config.pm
2187+
# Load specific settings from Kernel/Config.pm.
2188+
# Overriding settings from Kernel/Config/Defaults.pm.
21882189
$Self->Load();
21892190

21902191
# when in cluster mode, we must consider that files in Kernel/Config/Files

0 commit comments

Comments
 (0)