Skip to content

Commit

Permalink
Merge branch 'dev' into MaxNumberOfOptions
Browse files Browse the repository at this point in the history
  • Loading branch information
dennykorsukewitz authored Jul 19, 2024
2 parents 8cabe22 + 6634ef1 commit ce37de8
Show file tree
Hide file tree
Showing 171 changed files with 2,856 additions and 3,174 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci/config-mysql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ echo "Use INITIAL_INSERT_FILE: $INITIAL_INSERT_FILE"
echo "Use SCHEMA_POST_FILE: $SCHEMA_POST_FILE"

echo "Change character set"
mysql -h mariadb -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" -e "ALTER DATABASE znuny DEFAULT CHARACTER SET utf8;ALTER DATABASE znuny DEFAULT COLLATE utf8_unicode_ci;" || exit 1
mysql -h mariadb -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" -e "ALTER DATABASE znuny DEFAULT CHARACTER SET utf8mb4;ALTER DATABASE znuny DEFAULT COLLATE utf8mb4_unicode_ci;" || exit 1

echo "Create schema"
mysql -h mariadb -u "${MYSQL_USERNAME}" -p"${MYSQL_PASSWORD}" znuny < "$SCHEMA_FILE" || exit 1
Expand Down
9 changes: 9 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
# 7.1.1 2024-??-??
- 2024-07-17 Removed ArticlePreViewModules from Medium.pm view. No articles are displayed at this point.
- 2024-07-16 Added filtering and cache deletion to AdminSupportDataCollector.
- 2024-07-11 Updated Moment.js to 2.30.1 and jQueryUI to 1.13.3.
- 2024-07-11 Added a start and finish log message to Znuny daemon tasks. Thanks to Paweł Bogusławski (@pboguslawski). [#392](https://github.com/znuny/Znuny/pull/392)
- 2024-07-11 Fixed ticket list filter selection in agent dashboard and ticket list views.
- 2024-07-09 Added configurable timeout for DNS resolver queries. Thanks to Paweł Bogusławski (@pboguslawski). [#390](https://github.com/znuny/Znuny/pull/390)
- 2024-07-08 Invoker Ticket::Generic: Configured fields will now also be removed and encoded from/for given data (payload).
- 2024-07-05 Added a notification to ticket dialogs for the case when a form draft already exists for the current action.
- 2024-07-05 Improved and fixed links to customer and also customer user information center in several widgets and overview pages. [#558](https://github.com/znuny/Znuny/issues/558)
- 2024-07-05 Added a foreground option to run the Znuny daemon without detaching. Thanks to Paweł Bogusławski (@pboguslawski). [#399](https://github.com/znuny/Znuny/pull/399)
- 2024-07-04 Improved rendering of dynamic fields on AdminGenericAgent, AdminNotificationEvent, AdminACL and AdminDynamicFieldScreenConfiguration.
- 2024-07-02 Updated required minimum database versions. Refactored database version checks and added them to the installer.
- 2024-07-01 Fixed autocompletion search for dynamic field types WebserviceDropdown and WebserviceMultiselect in AgentTicketSearch dialog.
- 2024-06-21 Added functionality to use user fullname for mention label.
- 2024-06-20 Fixed output of last mention date in dashboard widget "Last mentions".
- 2024-06-20 Standard templates can now have multiple template types.
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Config/Defaults.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ sub LoadDefaults {
'thirdparty/jquery-3.7.0/jquery.js',
'thirdparty/jquery-browser-detection/jquery-browser-detection.js',
'thirdparty/jquery-validate-1.16.0/jquery.validate.js',
'thirdparty/jquery-ui-1.13.2/jquery-ui.js',
'thirdparty/jquery-ui-1.13.3/jquery-ui.js',
'thirdparty/jquery-pubsub/pubsub.js',
'thirdparty/jquery-jstree-3.3.7/jquery.jstree.js',
'thirdparty/nunjucks-3.2.2/nunjucks.min.js',
Expand Down Expand Up @@ -1037,7 +1037,7 @@ sub LoadDefaults {
$Self->{'Loader::Agent::CommonJS'}->{'000-Framework'} = [
'thirdparty/jquery-3.7.0/jquery.js',
'thirdparty/jquery-browser-detection/jquery-browser-detection.js',
'thirdparty/jquery-ui-1.13.2/jquery-ui.js',
'thirdparty/jquery-ui-1.13.3/jquery-ui.js',
'thirdparty/jquery-ui-touch-punch-0.2.3/jquery.ui.touch-punch.js',
'thirdparty/jquery-validate-1.16.0/jquery.validate.js',
'thirdparty/jquery-pubsub/pubsub.js',
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Config/Files/XML/Calendar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
</Item>
<Item Key="JavaScript">
<Array>
<Item>thirdparty/momentjs-2.29.4/moment.min.js</Item>
<Item>thirdparty/momentjs-2.30.1/moment.min.js</Item>
<Item>thirdparty/fullcalendar-3.10.2/fullcalendar.min.js</Item>
<Item>thirdparty/fullcalendar-scheduler-1.10.1/scheduler.min.js</Item>
<Item>Core.Agent.AppointmentCalendar.js</Item>
Expand Down Expand Up @@ -833,7 +833,7 @@
</Item>
<Item Key="JavaScript">
<Array>
<Item>thirdparty/momentjs-2.29.4/moment.min.js</Item>
<Item>thirdparty/momentjs-2.30.1/moment.min.js</Item>
<Item>thirdparty/fullcalendar-3.10.2/fullcalendar.min.js</Item>
<Item>Core.Agent.AppointmentCalendar.js</Item>
<Item>Core.Agent.AppointmentCalendar.Plugin.TicketCreate.js</Item>
Expand Down
6 changes: 3 additions & 3 deletions Kernel/Config/Files/XML/Framework.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4248,7 +4248,7 @@ via the Preferences button after logging in.
</Item>
<Item Key="JavaScript">
<Array>
<Item>thirdparty/momentjs-2.29.4/moment.min.js</Item>
<Item>thirdparty/momentjs-2.30.1/moment.min.js</Item>
<Item>thirdparty/fullcalendar-3.10.2/fullcalendar.min.js</Item>
<Item>thirdparty/d3-3.5.7/d3.min.js</Item>
<Item>thirdparty/nvd3-1.7.1/nvd3.min.js</Item>
Expand Down Expand Up @@ -7780,7 +7780,7 @@ via the Preferences button after logging in.
<Array>
<Item>thirdparty/jquery-3.7.0/jquery.js</Item>
<Item>thirdparty/jquery-browser-detection/jquery-browser-detection.js</Item>
<Item>thirdparty/jquery-ui-1.13.2/jquery-ui.js</Item>
<Item>thirdparty/jquery-ui-1.13.3/jquery-ui.js</Item>
<Item>thirdparty/jquery-ui-touch-punch-0.2.3/jquery.ui.touch-punch.js</Item>
<Item>thirdparty/jquery-validate-1.16.0/jquery.validate.js</Item>
<Item>thirdparty/jquery-pubsub/pubsub.js</Item>
Expand Down Expand Up @@ -7900,7 +7900,7 @@ via the Preferences button after logging in.
<Item>thirdparty/jquery-3.7.0/jquery.js</Item>
<Item>thirdparty/jquery-browser-detection/jquery-browser-detection.js</Item>
<Item>thirdparty/jquery-validate-1.16.0/jquery.validate.js</Item>
<Item>thirdparty/jquery-ui-1.13.2/jquery-ui.js</Item>
<Item>thirdparty/jquery-ui-1.13.3/jquery-ui.js</Item>
<Item>thirdparty/jquery-pubsub/pubsub.js</Item>
<Item>thirdparty/jquery-jstree-3.3.7/jquery.jstree.js</Item>
<Item>thirdparty/nunjucks-3.2.2/nunjucks.min.js</Item>
Expand Down
4 changes: 2 additions & 2 deletions Kernel/Config/Files/XML/Znuny.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2562,8 +2562,8 @@
<Hash>
<Item Key="Module">Kernel::Output::HTML::ToolBar::TicketMention</Item>
<Item Key="Block">ToolBarPersonalViews</Item>
<Item Key="CssClass">Mention</Item>
<Item Key="CssClassNew">Mention New</Item>
<Item Key="CssClass">MentionView</Item>
<Item Key="CssClassNew">MentionView New</Item>
<Item Key="Icon">fa fa-comment</Item>
<Item Key="IconNew">fa fa-comment</Item>
<Item Key="IconReached">fa fa-comment</Item>
Expand Down
14 changes: 13 additions & 1 deletion Kernel/GenericInterface/Invoker/Ticket/Generic.pm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ sub PrepareRequest {
if ( $Param{Data}->{TicketID} ) {
%Ticket = $TicketObject->TicketDeepGet(
TicketID => $Param{Data}->{TicketID},
ArticleID => $Param{Data}->{ArticleID},
ArticleID => $Param{Data}->{ArticleID}, # optional, hence not checked
GetAllArticleAttachments => $GetAllArticleAttachments,
UserID => 1,
);
Expand Down Expand Up @@ -119,6 +119,12 @@ sub PrepareRequest {
Data => \%Ticket,
HashKeys => \@HashKeys,
);

# Also remove elements from given payload.
$UtilObject->DataStructureRemoveElements(
Data => $Param{Data},
HashKeys => \@HashKeys,
);
}

# Base-64 encode configured field values.
Expand All @@ -137,6 +143,12 @@ sub PrepareRequest {
Data => \%Ticket,
HashKeys => \@HashKeys,
);

# Also encode elements of given payload.
$UtilObject->Base64DeepEncode(
Data => $Param{Data},
HashKeys => \@HashKeys,
);
}

my %Data = (
Expand Down
23 changes: 11 additions & 12 deletions Kernel/Language/ar_SA.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub Data {
$Self->{DateFormatShort} = '%D.%M.%Y';
$Self->{DateInputFormat} = '%D.%M.%Y';
$Self->{DateInputFormatLong} = '%D.%M.%Y - %T';
$Self->{Completeness} = 0.0747371879106439;
$Self->{Completeness} = 0.0747494660752423;

# csv separator
$Self->{Separator} = '';
Expand Down Expand Up @@ -646,9 +646,6 @@ sub Data {
'Query delay' => '',
'Delay (in milliseconds) until the AJAX request will be sent.' =>
'',
'Autocompletion for search fields' => '',
'Use autocompletion for search fields instead of a static selection of values that are currently selected in Znuny (in tickets, articles, etc.). This increases performance if many thousands of values of the dynamic field have been selected. This setting does not affect the search field displayed in AgentTicketSearch and CustomerTicketSearch.' =>
'',
'Input field width' => '',
'Width of the input field (percentage).' => '',
'Additional dynamic field storage' => '',
Expand Down Expand Up @@ -2039,6 +2036,7 @@ sub Data {
'Support Data' => '',
'Error: Support data could not be collected (%s).' => '',
'Support Data Collector' => '',
'Delete cache' => '',
'Details' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt
Expand Down Expand Up @@ -2136,7 +2134,6 @@ sub Data {

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt
'System file support' => '',
'Delete cache' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt
'Permissions' => '',
Expand Down Expand Up @@ -3021,6 +3018,8 @@ sub Data {
'You have loaded the draft "%s". You last changed it %s.' => '',
'You have loaded the draft "%s". It was last changed %s by %s.' =>
'',
'Please note that you have already one or more saved drafts for this action.' =>
'',
'Please note that this draft is outdated because the ticket was modified since this draft was created.' =>
'',

Expand Down Expand Up @@ -4487,9 +4486,11 @@ sub Data {
'',
'Error: Please set the value for innodb_log_file_size on your database to at least %s MB (current: %s MB, recommended: %s MB). For more information, please have a look at %s.' =>
'',
'Wrong default storage engine (%s is %s, but it needs to be InnoDB).' =>
'Error: Please set the value for innodb_file_per_table on your database to ON.' =>
'',
'Error: Please set the value for innodb_default_row_format on your database to dynamic.' =>
'',
'Wrong database collation (%s is %s, but it needs to be utf8).' =>
'Wrong default storage engine (%s is %s, but it needs to be InnoDB).' =>
'',

# Perl Module: Kernel/Modules/Mentions.pm
Expand Down Expand Up @@ -5037,13 +5038,11 @@ sub Data {

# Perl Module: Kernel/System/SupportDataCollector/Plugin/Database/mysql/Charset.pm
'Client Connection Charset' => '',
'Setting character_set_client needs to be utf8.' => '',
'Setting character_set_client needs to be utf8mb4.' => '',
'Server Database Charset' => '',
'This character set is not yet supported. Please convert your database to the character set \'utf8\'.' =>
'',
'The setting character_set_database needs to be \'utf8\'.' => '',
'The setting character_set_database needs to be \'utf8mb4\'.' => '',
'Table Charset' => '',
'There were tables found which do not have \'utf8\' as charset.' =>
'There were tables found which do not have \'utf8mb4\' as charset.' =>
'',

# Perl Module: Kernel/System/SupportDataCollector/Plugin/Database/mysql/InnoDBLogFileSize.pm
Expand Down
23 changes: 11 additions & 12 deletions Kernel/Language/bg.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub Data {
$Self->{DateFormatShort} = '%D.%M.%Y';
$Self->{DateInputFormat} = '%D.%M.%Y - %T';
$Self->{DateInputFormatLong} = '%D.%M.%Y - %T';
$Self->{Completeness} = 0.196452036793692;
$Self->{Completeness} = 0.196484310826351;

# csv separator
$Self->{Separator} = ';';
Expand Down Expand Up @@ -643,9 +643,6 @@ sub Data {
'Query delay' => '',
'Delay (in milliseconds) until the AJAX request will be sent.' =>
'',
'Autocompletion for search fields' => '',
'Use autocompletion for search fields instead of a static selection of values that are currently selected in Znuny (in tickets, articles, etc.). This increases performance if many thousands of values of the dynamic field have been selected. This setting does not affect the search field displayed in AgentTicketSearch and CustomerTicketSearch.' =>
'',
'Input field width' => '',
'Width of the input field (percentage).' => '',
'Additional dynamic field storage' => '',
Expand Down Expand Up @@ -2036,6 +2033,7 @@ sub Data {
'Support Data' => '',
'Error: Support data could not be collected (%s).' => '',
'Support Data Collector' => 'Поддръжка за събиране на данни',
'Delete cache' => '',
'Details' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt
Expand Down Expand Up @@ -2133,7 +2131,6 @@ sub Data {

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt
'System file support' => '',
'Delete cache' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt
'Permissions' => 'Разрешения',
Expand Down Expand Up @@ -3018,6 +3015,8 @@ sub Data {
'You have loaded the draft "%s". You last changed it %s.' => '',
'You have loaded the draft "%s". It was last changed %s by %s.' =>
'',
'Please note that you have already one or more saved drafts for this action.' =>
'',
'Please note that this draft is outdated because the ticket was modified since this draft was created.' =>
'',

Expand Down Expand Up @@ -4484,9 +4483,11 @@ sub Data {
'',
'Error: Please set the value for innodb_log_file_size on your database to at least %s MB (current: %s MB, recommended: %s MB). For more information, please have a look at %s.' =>
'',
'Wrong default storage engine (%s is %s, but it needs to be InnoDB).' =>
'Error: Please set the value for innodb_file_per_table on your database to ON.' =>
'',
'Error: Please set the value for innodb_default_row_format on your database to dynamic.' =>
'',
'Wrong database collation (%s is %s, but it needs to be utf8).' =>
'Wrong default storage engine (%s is %s, but it needs to be InnoDB).' =>
'',

# Perl Module: Kernel/Modules/Mentions.pm
Expand Down Expand Up @@ -5034,13 +5035,11 @@ sub Data {

# Perl Module: Kernel/System/SupportDataCollector/Plugin/Database/mysql/Charset.pm
'Client Connection Charset' => '',
'Setting character_set_client needs to be utf8.' => '',
'Setting character_set_client needs to be utf8mb4.' => '',
'Server Database Charset' => '',
'This character set is not yet supported. Please convert your database to the character set \'utf8\'.' =>
'',
'The setting character_set_database needs to be \'utf8\'.' => '',
'The setting character_set_database needs to be \'utf8mb4\'.' => '',
'Table Charset' => '',
'There were tables found which do not have \'utf8\' as charset.' =>
'There were tables found which do not have \'utf8mb4\' as charset.' =>
'',

# Perl Module: Kernel/System/SupportDataCollector/Plugin/Database/mysql/InnoDBLogFileSize.pm
Expand Down
23 changes: 11 additions & 12 deletions Kernel/Language/ca.pm
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub Data {
$Self->{DateFormatShort} = '%D.%M.%Y';
$Self->{DateInputFormat} = '%D.%M.%Y';
$Self->{DateInputFormatLong} = '%D.%M.%Y - %T';
$Self->{Completeness} = 0.205650459921156;
$Self->{Completeness} = 0.205684245112535;

# csv separator
$Self->{Separator} = '';
Expand Down Expand Up @@ -643,9 +643,6 @@ sub Data {
'Query delay' => '',
'Delay (in milliseconds) until the AJAX request will be sent.' =>
'',
'Autocompletion for search fields' => '',
'Use autocompletion for search fields instead of a static selection of values that are currently selected in Znuny (in tickets, articles, etc.). This increases performance if many thousands of values of the dynamic field have been selected. This setting does not affect the search field displayed in AgentTicketSearch and CustomerTicketSearch.' =>
'',
'Input field width' => '',
'Width of the input field (percentage).' => '',
'Additional dynamic field storage' => '',
Expand Down Expand Up @@ -2036,6 +2033,7 @@ sub Data {
'Support Data' => '',
'Error: Support data could not be collected (%s).' => '',
'Support Data Collector' => '',
'Delete cache' => '',
'Details' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt
Expand Down Expand Up @@ -2133,7 +2131,6 @@ sub Data {

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt
'System file support' => '',
'Delete cache' => '',

# TT Template: Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt
'Permissions' => 'Permisos',
Expand Down Expand Up @@ -3018,6 +3015,8 @@ sub Data {
'You have loaded the draft "%s". You last changed it %s.' => '',
'You have loaded the draft "%s". It was last changed %s by %s.' =>
'',
'Please note that you have already one or more saved drafts for this action.' =>
'',
'Please note that this draft is outdated because the ticket was modified since this draft was created.' =>
'',

Expand Down Expand Up @@ -4484,9 +4483,11 @@ sub Data {
'',
'Error: Please set the value for innodb_log_file_size on your database to at least %s MB (current: %s MB, recommended: %s MB). For more information, please have a look at %s.' =>
'',
'Wrong default storage engine (%s is %s, but it needs to be InnoDB).' =>
'Error: Please set the value for innodb_file_per_table on your database to ON.' =>
'',
'Error: Please set the value for innodb_default_row_format on your database to dynamic.' =>
'',
'Wrong database collation (%s is %s, but it needs to be utf8).' =>
'Wrong default storage engine (%s is %s, but it needs to be InnoDB).' =>
'',

# Perl Module: Kernel/Modules/Mentions.pm
Expand Down Expand Up @@ -5034,13 +5035,11 @@ sub Data {

# Perl Module: Kernel/System/SupportDataCollector/Plugin/Database/mysql/Charset.pm
'Client Connection Charset' => '',
'Setting character_set_client needs to be utf8.' => '',
'Setting character_set_client needs to be utf8mb4.' => '',
'Server Database Charset' => '',
'This character set is not yet supported. Please convert your database to the character set \'utf8\'.' =>
'',
'The setting character_set_database needs to be \'utf8\'.' => '',
'The setting character_set_database needs to be \'utf8mb4\'.' => '',
'Table Charset' => '',
'There were tables found which do not have \'utf8\' as charset.' =>
'There were tables found which do not have \'utf8mb4\' as charset.' =>
'',

# Perl Module: Kernel/System/SupportDataCollector/Plugin/Database/mysql/InnoDBLogFileSize.pm
Expand Down
Loading

0 comments on commit ce37de8

Please sign in to comment.