Skip to content

Commit 4b4d266

Browse files
CyperghostCyperghost
committed
Merge branch '6.2' into fancybox
# Conflicts: # package-lock.json # package.json
2 parents 7b7d08d + 1209e1c commit 4b4d266

File tree

321 files changed

+6734
-23103
lines changed

Some content is hidden

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

321 files changed

+6734
-23103
lines changed

‎.github/workflows/wcfsetup.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎com.woltlab.wcf/fileDelete.xml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,6 +2166,39 @@
21662166
<file>lib/system/api/paragonie/random_compat/other/build_phar.php</file>
21672167
<file>lib/system/api/paragonie/random_compat/psalm-autoload.php</file>
21682168
<file>lib/system/api/paragonie/random_compat/psalm.xml</file>
2169+
<file>lib/system/api/paragonie/sodium_compat/autoload-php7.php</file>
2170+
<file>lib/system/api/paragonie/sodium_compat/composer-php52.json</file>
2171+
<file>lib/system/api/paragonie/sodium_compat/lib/constants.php</file>
2172+
<file>lib/system/api/paragonie/sodium_compat/lib/sodium_compat.php</file>
2173+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/BLAKE2b.php</file>
2174+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20.php</file>
2175+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/Ctx.php</file>
2176+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/ChaCha20/IetfCtx.php</file>
2177+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519.php</file>
2178+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Fe.php</file>
2179+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Cached.php</file>
2180+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P1p1.php</file>
2181+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P2.php</file>
2182+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/P3.php</file>
2183+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/Ge/Precomp.php</file>
2184+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/H.php</file>
2185+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Curve25519/README.md</file>
2186+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Ed25519.php</file>
2187+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/HChaCha20.php</file>
2188+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/HSalsa20.php</file>
2189+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Int32.php</file>
2190+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Int64.php</file>
2191+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305.php</file>
2192+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Poly1305/State.php</file>
2193+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Salsa20.php</file>
2194+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/SecretStream/State.php</file>
2195+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/SipHash.php</file>
2196+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/Util.php</file>
2197+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/X25519.php</file>
2198+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/XChaCha20.php</file>
2199+
<file>lib/system/api/paragonie/sodium_compat/src/Core32/XSalsa20.php</file>
2200+
<file>lib/system/api/paragonie/sodium_compat/src/Crypto32.php</file>
2201+
<file>lib/system/api/paragonie/sodium_compat/src/PHP52/SplFixedArray.php</file>
21692202
<file>lib/system/api/parsedown/LICENSE.txt</file>
21702203
<file>lib/system/api/parsedown/Parsedown.php</file>
21712204
<file>lib/system/api/parsedown/README.md</file>
@@ -2758,6 +2791,7 @@
27582791
<file>lib/system/html/input/node/HtmlInputNodeWoltlabColor.class.php</file>
27592792
<file>lib/system/html/input/node/HtmlInputNodeWoltlabMention.class.php</file>
27602793
<file>lib/system/html/input/node/IHtmlInputNodeProcessor.class.php</file>
2794+
<file>lib/system/html/metacode/upcast/ImageMetacodeUpcast.class.php</file>
27612795
<file>lib/system/html/node/HtmlNodeProcessor.class.php</file>
27622796
<file>lib/system/html/output/AmpHtmlOutputProcessor.class.php</file>
27632797
<file>lib/system/html/output/HtmlOutputNodeProcessor.class.php</file>

‎com.woltlab.wcf/files_pre_check.tar‎

0 Bytes
Binary file not shown.

‎com.woltlab.wcf/package.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
66
<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
77
<isapplication>1</isapplication>
8-
<version>6.1.0 RC 1</version>
9-
<date>2024-10-10</date>
8+
<version>6.1.0</version>
9+
<date>2024-10-28</date>
1010
</packageinformation>
1111

1212
<authorinformation>
@@ -99,11 +99,8 @@ tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
9999
<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
100100
</instructions>
101101

102-
<instructions type="update" fromversion="6.1.0 Beta 2">
103-
<instruction type="acpTemplate">acptemplates_update.tar</instruction>
104-
<instruction type="file">files_update.tar</instruction>
105-
<instruction type="template">templates_update.tar</instruction>
106-
<instruction type="language"/>
102+
<instructions type="update" fromversion="6.1.0">
103+
<!-- https://github.com/WoltLab/WCF/commit/3434ac976c35ac20a16b717b2fe8d457841c6220 -->
107104
<instruction type="fileDelete"/>
108105
</instructions>
109106
</package>

‎com.woltlab.wcf/templates/authFlowHeader.tpl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
<div id="pageContainer" class="pageContainer">
3434
<div id="pageHeaderContainer" class="pageHeaderContainer">
35-
<header id="pageHeader" class="pageHeader">
35+
<header id="pageHeader" class="pageHeader pageHeader--authFlow">
3636
<div id="pageHeaderPanel" class="pageHeaderPanel">
3737
<div class="layoutBoundary">
3838
{include file='pageHeaderMenu'}

‎com.woltlab.wcf/templates/headIncludeJavaScript.tpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ window.addEventListener('pageshow', function(event) {
8282
publicKey: '{@SERVICE_WORKER_PUBLIC_KEY|encodeJS}',
8383
serviceWorkerJsUrl: '{$__wcf->getPath('wcf')}service-worker/',
8484
registerUrl: '{link controller="RegisterServiceWorker"}{/link}',
85+
notificationLastReadTime: {$__wcf->getUserNotificationHandler()->getTimeOfLastReadNotification()}
8586
},
8687
{/if}
8788
dynamicColorScheme: {if $__wcf->getStyleHandler()->getColorScheme() === 'system'}true{else}false{/if},

‎com.woltlab.wcf/templates/searchResultList.tpl‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,21 @@
44
<li class="gridListItem gridListItemMessage">
55
<div class="gridListItemImage">
66
{if $customIcons[$message->getObjectTypeName()]|isset}
7-
{icon size=48 name=$customIcons[$message->getObjectTypeName()]}
7+
<div class="gridListItemLargeIcon">
8+
{icon size=48 name=$customIcons[$message->getObjectTypeName()]}
9+
</div>
10+
<div class="gridListItemSmallIcon">
11+
{icon size=32 name=$customIcons[$message->getObjectTypeName()]}
12+
</div>
813
{elseif $message->getUserProfile()}
914
{user object=$message->getUserProfile() type='avatar48' ariaHidden='true' tabindex='-1'}
1015
{else}
11-
{icon size=48 name='file'}
16+
<div class="gridListItemLargeIcon">
17+
{icon size=48 name='file'}
18+
</div>
19+
<div class="gridListItemSmallIcon">
20+
{icon size=32 name='file'}
21+
</div>
1222
{/if}
1323
</div>
1424

‎com.woltlab.wcf/templates/shared_multiplePagesSelectionFormField.tpl‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{include file="shared_multipleSelectionFormField"}
2+
3+
{if $field->getVisibleEverywhereFieldId() !== null}
4+
<script data-relocate="true">
5+
{
6+
const label = document.querySelector('label[for="{$field->getPrefixedId()}"]');
7+
8+
document.querySelectorAll('input[name="{$field->getVisibleEverywhereFieldId()}"]').forEach((input) => {
9+
input.addEventListener("change", () => {
10+
setLabelText(input.value);
11+
});
12+
});
13+
14+
function setLabelText (value) {
15+
label.innerHTML = parseInt(value) === 0 ? '{unsafe:$field->getLabel()|encodeJS}' : '{unsafe:$field->getInvertedLabel()|encodeJS}';
16+
}
17+
18+
setLabelText(document.querySelector('input[name="{$field->getVisibleEverywhereFieldId()}"]:checked').value);
19+
}
20+
</script>
21+
{/if}

0 commit comments

Comments
 (0)