GitHub/WoltLab/WCF.git
3 years agoReference `COMPILER_TARGET_DEFAULT` without going via `globalThis`
Tim Düsterhus [Thu, 22 Jul 2021 12:56:37 +0000 (14:56 +0200)]
Reference `COMPILER_TARGET_DEFAULT` without going via `globalThis`

This is required, because the minifier will not detect it otherwise.

3 years agoText links in the mobile menu of the admin panel did not work
Marcel Werk [Thu, 22 Jul 2021 11:43:45 +0000 (13:43 +0200)]
Text links in the mobile menu of the admin panel did not work

3 years agoFix mistake in informal version of de.xml
Tim Düsterhus [Wed, 21 Jul 2021 13:18:37 +0000 (15:18 +0200)]
Fix mistake in informal version of de.xml

3 years agoMerge pull request #4412 from WoltLab/coverPhoto-upgrade
Tim Düsterhus [Tue, 20 Jul 2021 15:18:05 +0000 (17:18 +0200)]
Merge pull request #4412 from WoltLab/coverPhoto-upgrade

Improve resiliency of the style cover photo upgrade script

3 years agoCheck whether the style's cover photo exists during upgrade to 5.4
Tim Düsterhus [Tue, 20 Jul 2021 14:27:31 +0000 (16:27 +0200)]
Check whether the style's cover photo exists during upgrade to 5.4

3 years agoMerge pull request #4411 from WoltLab/test-for-webp-support
Alexander Ebert [Tue, 20 Jul 2021 13:59:03 +0000 (15:59 +0200)]
Merge pull request #4411 from WoltLab/test-for-webp-support

Fall-back to GD if ImageMagick does not satisfy the requirements

3 years agoPartially reverted the logic for the image library check
Alexander Ebert [Tue, 20 Jul 2021 13:50:29 +0000 (15:50 +0200)]
Partially reverted the logic for the image library check

3 years agoFall-back to GD if ImageMagick does not satisfy the requirements
Alexander Ebert [Tue, 20 Jul 2021 12:42:39 +0000 (14:42 +0200)]
Fall-back to GD if ImageMagick does not satisfy the requirements

3 years agoAdd update_com.woltlab.wcf_5.4.2_deleteInvalidSessions.php
Tim Düsterhus [Tue, 20 Jul 2021 10:52:24 +0000 (12:52 +0200)]
Add update_com.woltlab.wcf_5.4.2_deleteInvalidSessions.php

3 years agoDefault IP address to `::` if `$_SERVER['REMOTE_ADDR']` is unavailable
Tim Düsterhus [Tue, 20 Jul 2021 10:43:38 +0000 (12:43 +0200)]
Default IP address to `::` if `$_SERVER['REMOTE_ADDR']` is unavailable

The session list within the AccountSecurityPage relies on all sessions storing
valid IP addresses. When using `cli.php` no `REMOTE_ADDR` will be available and
an empty string was being stored. As the empty string is not a valid IP address
the `\wcf\util\IpAddress` class errored out.

Fix this issue by always returning a syntactically valid IP address from
`UserUtil::getIpAddress()`. `::` is being used which is commonly used to
indicate unknown IP addresses and must never appear within valid IP packets.

3 years agoDisable unfurled links in AMP pages
joshuaruesweg [Tue, 20 Jul 2021 10:12:15 +0000 (12:12 +0200)]
Disable unfurled links in AMP pages

3 years agoPrevent inverting permissions, if the object is visible for everyone
joshuaruesweg [Tue, 20 Jul 2021 09:36:13 +0000 (11:36 +0200)]
Prevent inverting permissions, if the object is visible for everyone

If the permission is inverted and the object is allowed for everyone, the object cannot seen by anyone. Furthermore the admin can only uncheck the inverted permissions button, if the object is not allowed for everyone anymore.

3 years agoFix faulty invertPermission label logic
joshuaruesweg [Tue, 20 Jul 2021 08:50:29 +0000 (10:50 +0200)]
Fix faulty invertPermission label logic

3 years agoAdd missing `@since` to ISafeFormatAvatar
Tim Düsterhus [Tue, 20 Jul 2021 07:10:20 +0000 (09:10 +0200)]
Add missing `@since` to ISafeFormatAvatar

3 years agoMissing implicit function scope
Alexander Ebert [Mon, 19 Jul 2021 15:35:42 +0000 (17:35 +0200)]
Missing implicit function scope

3 years agoCast empty values for the file size to int
Alexander Ebert [Mon, 19 Jul 2021 15:32:25 +0000 (17:32 +0200)]
Cast empty values for the file size to int

PHP 8 is much more sensitive to type mismatches, before PHP 8 the value `''` was implicitly converted to `0`.

3 years agoWebP was not recognised as image format when uploading images
Marcel Werk [Mon, 19 Jul 2021 14:24:38 +0000 (16:24 +0200)]
WebP was not recognised as image format when uploading images

3 years agoMake renaming columns with PHP DB API idempotent (#4367)
Matthias Schmidt [Mon, 5 Jul 2021 09:15:20 +0000 (11:15 +0200)]
Make renaming columns with PHP DB API idempotent (#4367)

An error message should only be shown if the neither a column with the old name, nor with the name name exists so that after the rename, a second rename is a no-op.

Close #4362
See #3765

(cherry picked from commit 1a029332791f3e3cdca054d8f139857b5ef78791)

3 years agoMerge pull request #4405 from WoltLab/migrateMultifactor-deleted-user
Joshua Rüsweg [Fri, 16 Jul 2021 08:43:12 +0000 (10:43 +0200)]
Merge pull request #4405 from WoltLab/migrateMultifactor-deleted-user

Skip authenticators of deleted users in update_com.woltlab.wcf_5.4_migrate_multifactor.php

3 years agoSkip authenticators of deleted users in update_com.woltlab.wcf_5.4_migrate_multifacto...
Tim Düsterhus [Thu, 15 Jul 2021 14:50:59 +0000 (16:50 +0200)]
Skip authenticators of deleted users in update_com.woltlab.wcf_5.4_migrate_multifactor.php

3 years agoMerge branch '5.3' into 5.4 5.4.1
Alexander Ebert [Thu, 15 Jul 2021 12:07:03 +0000 (14:07 +0200)]
Merge branch '5.3' into 5.4

3 years agoRelease 5.3.12 5.3.12
Alexander Ebert [Thu, 15 Jul 2021 12:04:15 +0000 (14:04 +0200)]
Release 5.3.12

3 years agoRelease 5.4.1
Alexander Ebert [Thu, 15 Jul 2021 11:58:44 +0000 (13:58 +0200)]
Release 5.4.1

3 years agoMerge branch '5.3' into 5.4
Tim Düsterhus [Thu, 15 Jul 2021 11:56:01 +0000 (13:56 +0200)]
Merge branch '5.3' into 5.4

3 years agoMerge pull request #4404 from WoltLab/imagick-webp-optional
Alexander Ebert [Thu, 15 Jul 2021 11:05:26 +0000 (13:05 +0200)]
Merge pull request #4404 from WoltLab/imagick-webp-optional

Permit the upgrade if only GD with WebP support is present

3 years agoRebuild the pre-update file archive
Alexander Ebert [Thu, 15 Jul 2021 11:00:55 +0000 (13:00 +0200)]
Rebuild the pre-update file archive

3 years agoMerge branch '5.4' into imagick-webp-optional
Alexander Ebert [Thu, 15 Jul 2021 11:00:14 +0000 (13:00 +0200)]
Merge branch '5.4' into imagick-webp-optional

3 years agoMerge pull request #4403 from WoltLab/5.4-sqlLog
Alexander Ebert [Thu, 15 Jul 2021 10:57:46 +0000 (12:57 +0200)]
Merge pull request #4403 from WoltLab/5.4-sqlLog

Add missing SQL log entry for `wcf1_acp_session_virtual` during upgrade to 5.4

3 years agoUpdated the pre-update file archive
Alexander Ebert [Thu, 15 Jul 2021 10:52:39 +0000 (12:52 +0200)]
Updated the pre-update file archive

3 years agoAllow bypass of a broken imagick extension, improved error messages
Alexander Ebert [Thu, 15 Jul 2021 10:50:51 +0000 (12:50 +0200)]
Allow bypass of a broken imagick extension, improved error messages

3 years agoImproved the explanation for missing system requirements
Alexander Ebert [Thu, 15 Jul 2021 10:45:36 +0000 (12:45 +0200)]
Improved the explanation for missing system requirements

3 years agoAdd missing SQL log entry for `wcf1_acp_session_virtual` during upgrade to 5.4
Tim Düsterhus [Thu, 15 Jul 2021 09:57:39 +0000 (11:57 +0200)]
Add missing SQL log entry for `wcf1_acp_session_virtual` during upgrade to 5.4

This entry is required to be able to delete this table later in the process.

3 years agoCheck for WebP support in the selected adapter
Alexander Ebert [Thu, 15 Jul 2021 09:22:06 +0000 (11:22 +0200)]
Check for WebP support in the selected adapter

3 years agoFix typo in de.xml
Tim Düsterhus [Thu, 15 Jul 2021 07:19:22 +0000 (09:19 +0200)]
Fix typo in de.xml

3 years agoRelease 5.4.0 5.4.0
Alexander Ebert [Wed, 14 Jul 2021 15:38:49 +0000 (17:38 +0200)]
Release 5.4.0

3 years agoMerge branch '5.3' into 5.4
Tim Düsterhus [Wed, 14 Jul 2021 13:34:06 +0000 (15:34 +0200)]
Merge branch '5.3' into 5.4

3 years agoRelease 5.3.11 5.3.11
Alexander Ebert [Wed, 14 Jul 2021 13:14:25 +0000 (15:14 +0200)]
Release 5.3.11

3 years agoRemoved reference to earlier evaluation versions
Alexander Ebert [Wed, 14 Jul 2021 12:27:04 +0000 (14:27 +0200)]
Removed reference to earlier evaluation versions

3 years agoEnable the upgrade notice for 5.4 by default
Alexander Ebert [Wed, 14 Jul 2021 12:08:06 +0000 (14:08 +0200)]
Enable the upgrade notice for 5.4 by default

3 years agoRemoved a legacy condition used in the old session system
Alexander Ebert [Tue, 13 Jul 2021 15:32:34 +0000 (17:32 +0200)]
Removed a legacy condition used in the old session system

This is an old condition that dates back to the early days of the keep alive system. The condition does not work with the new session system anymore, because `lastActivityTime` is always mapped to `TIME_NOW`.

3 years agoMerge pull request #4383 from WoltLab/article_embedded
Marcel Werk [Tue, 13 Jul 2021 15:15:06 +0000 (17:15 +0200)]
Merge pull request #4383 from WoltLab/article_embedded

Fix recursively loading embedded objects in articles

3 years agoMerge pull request #4346 from mutec/currencydecimals
Alexander Ebert [Tue, 13 Jul 2021 14:43:03 +0000 (16:43 +0200)]
Merge pull request #4346 from mutec/currencydecimals

support custom number of decimals in currency modifier

3 years agoSaving WebP images in GD requires a True Color palette
Alexander Ebert [Tue, 13 Jul 2021 14:31:03 +0000 (16:31 +0200)]
Saving WebP images in GD requires a True Color palette

https://stackoverflow.com/questions/39292617/fatal-error-paletter-image-not-supported-by-webp/47469726#47469726

3 years agoMerge branch '5.3'
joshuaruesweg [Tue, 13 Jul 2021 08:39:27 +0000 (10:39 +0200)]
Merge branch '5.3'

3 years agoUse `emailConfirmed` status to exclude unconfirmed emails
joshuaruesweg [Tue, 13 Jul 2021 08:31:43 +0000 (10:31 +0200)]
Use `emailConfirmed` status to exclude unconfirmed emails

With 5.3 we introduced the new `emailConfirmed` status to separate the status of the email and the activation status of the user. Therefore, we want to send emails to users, which emails are enabled. The user activation status is not relevant anymore for sending emails.

3 years agoMerge pull request #4397 from WoltLab/favicon-is-processed
Tim Düsterhus [Tue, 13 Jul 2021 07:32:08 +0000 (09:32 +0200)]
Merge pull request #4397 from WoltLab/favicon-is-processed

Improve Favicon handling in StyleAction

3 years agoDevtools did not work correctly under Windows
Marcel Werk [Mon, 12 Jul 2021 18:07:22 +0000 (20:07 +0200)]
Devtools did not work correctly under Windows

3 years agoIncorrect keystroke
Alexander Ebert [Mon, 12 Jul 2021 14:52:32 +0000 (16:52 +0200)]
Incorrect keystroke

3 years agoMissing `px` units for the image dimensions
Alexander Ebert [Mon, 12 Jul 2021 14:50:47 +0000 (16:50 +0200)]
Missing `px` units for the image dimensions

3 years agoMerge branch '5.4' of https://github.com/WoltLab/WCF into 5.4
Alexander Ebert [Mon, 12 Jul 2021 14:40:03 +0000 (16:40 +0200)]
Merge branch '5.4' of https://github.com/WoltLab/WCF into 5.4

3 years agoMissing cover photo in the list of articles in a footer box
Alexander Ebert [Mon, 12 Jul 2021 14:39:56 +0000 (16:39 +0200)]
Missing cover photo in the list of articles in a footer box

Replaces #4378

3 years agoUpgrade the default STARTTLS level to `encrypt`
Tim Düsterhus [Mon, 12 Jul 2021 14:27:34 +0000 (16:27 +0200)]
Upgrade the default STARTTLS level to `encrypt`

see #4246

3 years agoUpdate the default SMTP port to 587
Tim Düsterhus [Mon, 12 Jul 2021 13:55:57 +0000 (15:55 +0200)]
Update the default SMTP port to 587

25 is not meant for submission.

3 years agoExplicitly mark styles for 5.2+ as compatible with 5.4
Alexander Ebert [Mon, 12 Jul 2021 13:40:28 +0000 (15:40 +0200)]
Explicitly mark styles for 5.2+ as compatible with 5.4

3 years agoRegenerate Favicon images only when the template changes
Tim Düsterhus [Mon, 12 Jul 2021 12:55:31 +0000 (14:55 +0200)]
Regenerate Favicon images only when the template changes

3 years agoDelete manifest.json and browserconfig.xml when deleting a favicon
Tim Düsterhus [Mon, 12 Jul 2021 12:53:05 +0000 (14:53 +0200)]
Delete manifest.json and browserconfig.xml when deleting a favicon

3 years agoMerge pull request #4392 from WoltLab/rename-totp-field
Joshua Rüsweg [Sun, 11 Jul 2021 16:02:54 +0000 (18:02 +0200)]
Merge pull request #4392 from WoltLab/rename-totp-field

Rename TOTP code form field to `onetimecode`

3 years agosupport custom number of decimals in currency modifier
mutec [Sat, 26 Jun 2021 17:17:46 +0000 (19:17 +0200)]
support custom number of decimals in currency modifier

3 years agoRename TOTP code form field to `onetimecode`
joshuaruesweg [Sun, 11 Jul 2021 09:28:07 +0000 (11:28 +0200)]
Rename TOTP code form field to `onetimecode`

The name `code` for the form field is too generic and should be specified. `onetimecode` is a more fitting identifier for the input name. In addition, 1password fills the totp code automatically, if the field is named `onetimecode` (See https://1password.community/discussion/comment/604200/#Comment_604200).

3 years agoConvert tabs to spaces
joshuaruesweg [Sun, 11 Jul 2021 08:50:15 +0000 (10:50 +0200)]
Convert tabs to spaces

3 years agoMerge branch '5.3'
joshuaruesweg [Sun, 11 Jul 2021 08:48:21 +0000 (10:48 +0200)]
Merge branch '5.3'

3 years agoMerge branch '5.2'
joshuaruesweg [Sun, 11 Jul 2021 08:34:16 +0000 (10:34 +0200)]
Merge branch '5.2'

3 years agoMerge branch '3.1'
joshuaruesweg [Sun, 11 Jul 2021 08:31:21 +0000 (10:31 +0200)]
Merge branch '3.1'

3 years agoDon't leak an account's activation status (#4365)
Sascha Greuel [Sun, 11 Jul 2021 08:24:24 +0000 (10:24 +0200)]
Don't leak an account's activation status (#4365)

* Don't leak an account's activation status

* Update wcfsetup/install/files/lib/form/RegisterNewActivationCodeForm.class.php

Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
Co-authored-by: Tim Düsterhus <timwolla@googlemail.com>
3 years agoMerge branch '5.3'
joshuaruesweg [Sat, 10 Jul 2021 09:44:09 +0000 (11:44 +0200)]
Merge branch '5.3'

3 years agoSet new activation code on rerequesting them
joshuaruesweg [Sat, 10 Jul 2021 09:39:33 +0000 (11:39 +0200)]
Set new activation code on rerequesting them

3 years agoRelease 5.4.0 RC 2 5.4.0_RC_2
Alexander Ebert [Thu, 8 Jul 2021 13:38:43 +0000 (15:38 +0200)]
Release 5.4.0 RC 2

3 years agoFix recursively loading embedded objects in articles
Matthias Schmidt [Thu, 8 Jul 2021 07:36:37 +0000 (09:36 +0200)]
Fix recursively loading embedded objects in articles

Close #4382
See 3af7b77d40ed93c95cebb22004ab745bf69683e2

3 years agoAdd update_com.woltlab.wcf_5.4_styleCoverPhoto.php to package.xml
Tim Düsterhus [Thu, 8 Jul 2021 07:25:39 +0000 (09:25 +0200)]
Add update_com.woltlab.wcf_5.4_styleCoverPhoto.php to package.xml

3 years agoDo not use the cache in update_com.woltlab.wcf_5.4_styleCoverPhoto.php
Tim Düsterhus [Thu, 8 Jul 2021 07:25:20 +0000 (09:25 +0200)]
Do not use the cache in update_com.woltlab.wcf_5.4_styleCoverPhoto.php

3 years agoFix variable name in `ViewableArticleContentList::readObjects()`
Matthias Schmidt [Thu, 8 Jul 2021 06:50:43 +0000 (08:50 +0200)]
Fix variable name in `ViewableArticleContentList::readObjects()`

3 years agoDo not block matching abbreviation if the package is the same
Alexander Ebert [Wed, 7 Jul 2021 16:16:32 +0000 (18:16 +0200)]
Do not block matching abbreviation if the package is the same

The previous code would block the installation of an update of the same package.

Fix for #4357

3 years agoRelease 5.4.0 RC 2
Alexander Ebert [Wed, 7 Jul 2021 15:58:23 +0000 (17:58 +0200)]
Release 5.4.0 RC 2

3 years agoUpdating minified JavaScript files
WoltLab [Wed, 7 Jul 2021 15:41:36 +0000 (15:41 +0000)]
Updating minified JavaScript files

3 years agoImproved the visuals of the list of MFA options
Alexander Ebert [Wed, 7 Jul 2021 15:14:55 +0000 (17:14 +0200)]
Improved the visuals of the list of MFA options

The content is now vertically centered and the somewhat tiny smartphone icon is enlarged to better match the other icons.

3 years agoUse `<small>` instead of `<p class="small">`
Alexander Ebert [Wed, 7 Jul 2021 15:08:28 +0000 (17:08 +0200)]
Use `<small>` instead of `<p class="small">`

3 years agoFix `this` value for `Core.enableLegacyInheritance()` (#4380)
Matthias Schmidt [Wed, 7 Jul 2021 10:48:12 +0000 (12:48 +0200)]
Fix `this` value for `Core.enableLegacyInheritance()` (#4380)

Without explicitly binding `this` to `thisValue`, it will be `constructed` resulting in missing data only present in `thisValue`.

3 years agoExplicitly show error message if import queue is empty
Matthias Schmidt [Wed, 7 Jul 2021 08:25:33 +0000 (10:25 +0200)]
Explicitly show error message if import queue is empty

Close #3804
See #4379

3 years agoMerge branch '5.3' into 5.4
Matthias Schmidt [Wed, 7 Jul 2021 07:05:42 +0000 (09:05 +0200)]
Merge branch '5.3' into 5.4

3 years agoFix reading value of `CheckboxFormField`
Matthias Schmidt [Wed, 7 Jul 2021 07:01:14 +0000 (09:01 +0200)]
Fix reading value of `CheckboxFormField`

In contrast to `BooleanFormField` for which an explicit "no" input field exists, a normal checkbox does not submit any data if no checked.

3 years agoMerge branch '5.4' of https://github.com/WoltLab/WCF into 5.4
Alexander Ebert [Tue, 6 Jul 2021 12:47:11 +0000 (14:47 +0200)]
Merge branch '5.4' of https://github.com/WoltLab/WCF into 5.4

3 years agoIncorrect type cast to `number`
Alexander Ebert [Tue, 6 Jul 2021 12:47:03 +0000 (14:47 +0200)]
Incorrect type cast to `number`

3 years agoFix conversion of `Dictionary` to `Map` in `Acp/Ui/Menu/Item/Handler`
Matthias Schmidt [Tue, 6 Jul 2021 12:34:01 +0000 (14:34 +0200)]
Fix conversion of `Dictionary` to `Map` in `Acp/Ui/Menu/Item/Handler`

See 2727575fbe8a2ca2fe4a19288c7a982969170882

3 years agoSearch for articles toggled the incorrect container
Alexander Ebert [Tue, 6 Jul 2021 12:33:14 +0000 (14:33 +0200)]
Search for articles toggled the incorrect container

3 years agoMerge branch '5.3' into 5.4
Matthias Schmidt [Tue, 6 Jul 2021 12:24:10 +0000 (14:24 +0200)]
Merge branch '5.3' into 5.4

3 years agoRemove obsolete style logo upload field descriptions
Matthias Schmidt [Tue, 6 Jul 2021 12:23:51 +0000 (14:23 +0200)]
Remove obsolete style logo upload field descriptions

See #3456

3 years agoFixed missing language version for embedded articles
Marcel Werk [Tue, 6 Jul 2021 11:08:46 +0000 (13:08 +0200)]
Fixed missing language version for embedded articles

3 years agoMerge remote-tracking branch 'origin/5.4' into 5.4
Tim Düsterhus [Tue, 6 Jul 2021 10:48:04 +0000 (12:48 +0200)]
Merge remote-tracking branch 'origin/5.4' into 5.4

3 years agoMerge branch '5.3' into 5.4
Tim Düsterhus [Tue, 6 Jul 2021 10:47:52 +0000 (12:47 +0200)]
Merge branch '5.3' into 5.4

3 years agoAdd missing encoding of `$family` in font download requests
Tim Düsterhus [Tue, 6 Jul 2021 10:46:01 +0000 (12:46 +0200)]
Add missing encoding of `$family` in font download requests

3 years agoAdd missing since tag for `User::requiresMultifactor()`
Matthias Schmidt [Tue, 6 Jul 2021 09:42:35 +0000 (11:42 +0200)]
Add missing since tag for `User::requiresMultifactor()`

3 years agoMerge branch '5.3' into 5.4
Tim Düsterhus [Tue, 6 Jul 2021 08:23:25 +0000 (10:23 +0200)]
Merge branch '5.3' into 5.4

3 years agoMerge branch '5.2' into 5.3
Tim Düsterhus [Tue, 6 Jul 2021 07:34:53 +0000 (09:34 +0200)]
Merge branch '5.2' into 5.3

3 years agoMerge branch '3.1' into 5.2
Tim Düsterhus [Tue, 6 Jul 2021 07:34:26 +0000 (09:34 +0200)]
Merge branch '3.1' into 5.2

3 years agoRemove duplicate `class` attribute in cacheList.tpl
Tim Düsterhus [Tue, 6 Jul 2021 07:32:45 +0000 (09:32 +0200)]
Remove duplicate `class` attribute in cacheList.tpl

3 years agoCheck for WebP support in update_com.woltlab.wcf_5.4_checkSystemRequirements.php
Tim Düsterhus [Mon, 5 Jul 2021 12:18:15 +0000 (14:18 +0200)]
Check for WebP support in update_com.woltlab.wcf_5.4_checkSystemRequirements.php

3 years agoMerge branch '5.3' into 5.4
Tim Düsterhus [Mon, 5 Jul 2021 12:17:29 +0000 (14:17 +0200)]
Merge branch '5.3' into 5.4

3 years agoMerge pull request #4368 from WoltLab/upgrade-check-webp
Tim Düsterhus [Mon, 5 Jul 2021 12:09:42 +0000 (14:09 +0200)]
Merge pull request #4368 from WoltLab/upgrade-check-webp

Add check for GD support to PackageEnableUpgradeOverrideForm

3 years agoAdd check for GD support to PackageEnableUpgradeOverrideForm
Tim Düsterhus [Mon, 5 Jul 2021 11:57:40 +0000 (13:57 +0200)]
Add check for GD support to PackageEnableUpgradeOverrideForm

3 years agoMerge branch '5.3' into 5.4
Tim Düsterhus [Mon, 5 Jul 2021 10:45:33 +0000 (12:45 +0200)]
Merge branch '5.3' into 5.4