Skip to content

Commit 1a410bd

Browse files
CyperghostCyperghost
committed
Merge branch '6.2' into 6.2-captcha
# Conflicts: # wcfsetup/install/files/lib/data/TI18nDatabaseObjectAction.class.php
2 parents 983bacc + 8ff1df0 commit 1a410bd

File tree

365 files changed

+6992
-24996
lines changed

Some content is hidden

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

365 files changed

+6992
-24996
lines changed

‎.github/workflows/javascript.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@ jobs:
6868
- name: "Check '@ckeditor/ckeditor5-inspector'"
6969
run: |
7070
diff -wu wcfsetup/install/files/js/3rdParty/ckeditor/ckeditor5-inspector/inspector.js node_modules/@ckeditor/ckeditor5-inspector/build/inspector.js
71+
- name: "Check '@fancyapps/ui'"
72+
run: |
73+
diff -wu wcfsetup/install/files/js/3rdParty/fancybox/fancybox.umd.js node_modules/@fancyapps/ui/dist/fancybox/fancybox.umd.js

‎.github/workflows/wcfsetup.yml‎

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

‎README.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
WoltLab Suite Core is a free CMS and web-framework, designed for awesome websites and communities.
44
Cutting-edge technologies and strict object-oriented programming makes it the ideal choice for developers and communities, and is actively maintained and improved by WoltLab.
55

6-
# About CKEditor 5
6+
## About CKEditor 5
77

88
CKEditor 5 is a WYISWYG editor created by CKSource Holding sp. z o.o, Copyright (c) 2003-2023.
99

@@ -12,6 +12,15 @@ You may use this instance of CKEditor 5 with any plugin or app built on top of W
1212

1313
If you would like to use CKEditor 5 yourself and are not building on top of WoltLab Suite Core then please visit https://ckeditor.com/pricing/ to learn more.
1414

15+
## About Fancybox
16+
17+
Fancybox is a lightbox alternative created by Jānis Skarnelis.
18+
19+
This repository includes a build artifact of Fancybox that is comerically licensed to WoltLab GmbH.
20+
You may use this instance of Fancybox with any plugin or app built on top of WoltLab Suite Core only.
21+
22+
If you would like to use Fancybox yourself and are not building on top of WoltLab Suite Core then please visit https://fancyapps.com/pricing/ to learn more.
23+
1524
## License
1625

1726
This library is free software; you can redistribute it and/or

‎com.woltlab.wcf/acpTemplateDelete.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,5 +154,6 @@
154154
<template>__audioAttachmentBBCode</template>
155155
<template>__multiPageCondition</template>
156156
<template>__multilineItemListFormField</template>
157+
<template>imageViewer</template>
157158
</delete>
158159
</data>

‎com.woltlab.wcf/fileDelete.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,6 +1291,7 @@
12911291
<file>js/WCF.Comment.min.js</file>
12921292
<file>js/WCF.Core.min.js</file>
12931293
<file>js/WCF.ImageViewer.min.js</file>
1294+
<file>js/WCF.ImageViewer.js</file>
12941295
<file>js/WCF.Label.min.js</file>
12951296
<file>js/WCF.Like.js</file>
12961297
<file>js/WCF.Like.min.js</file>
@@ -2165,6 +2166,39 @@
21652166
<file>lib/system/api/paragonie/random_compat/other/build_phar.php</file>
21662167
<file>lib/system/api/paragonie/random_compat/psalm-autoload.php</file>
21672168
<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>
21682202
<file>lib/system/api/parsedown/LICENSE.txt</file>
21692203
<file>lib/system/api/parsedown/Parsedown.php</file>
21702204
<file>lib/system/api/parsedown/README.md</file>
@@ -2757,6 +2791,7 @@
27572791
<file>lib/system/html/input/node/HtmlInputNodeWoltlabColor.class.php</file>
27582792
<file>lib/system/html/input/node/HtmlInputNodeWoltlabMention.class.php</file>
27592793
<file>lib/system/html/input/node/IHtmlInputNodeProcessor.class.php</file>
2794+
<file>lib/system/html/metacode/upcast/ImageMetacodeUpcast.class.php</file>
27602795
<file>lib/system/html/node/HtmlNodeProcessor.class.php</file>
27612796
<file>lib/system/html/output/AmpHtmlOutputProcessor.class.php</file>
27622797
<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/templateDelete.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,6 @@
116116
<template>__multiPageCondition</template>
117117
<template>__multilineItemListFormField</template>
118118
<template>email_notification_userRegistration</template>
119+
<template>imageViewer</template>
119120
</delete>
120121
</data>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
{content}
88
{foreach from=$attachmentList->getGroupedObjects($objectID) item=attachment}
99
{if $attachment->showAsImage() && !$attachment->isEmbedded()}
10-
<li class="attachmentThumbnail" data-attachment-id="{@$attachment->attachmentID}">
11-
<a href="{$attachment->getLink()}"{if $attachment->canDownload()} class="jsImageViewer jsTooltip" title="{lang}wcf.attachment.image.title{/lang}"{/if}>
10+
<li class="attachmentThumbnail" data-attachment-id="{$attachment->attachmentID}">
11+
<a href="{$attachment->getLink()}"{if $attachment->canDownload()} data-fancybox="message-{$attachmentList->getObjectTypeName()}-{$objectID}" data-caption="{$attachment->filename}" aria-title="{lang}wcf.attachment.image.title{/lang}"{/if}>
1212
<div class="attachmentThumbnailContainer">
1313
<span class="attachmentThumbnailImage">
1414
{if $attachment->hasThumbnail()}
@@ -44,7 +44,7 @@
4444
<ul class="attachmentMetaData inlineList">
4545
<li>
4646
{icon name='file-lines'}
47-
{@$attachment->filesize|filesize}
47+
{$attachment->filesize|filesize}
4848
</li>
4949
<li>
5050
{icon name='up-right-and-down-left-from-center'}

‎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'}

0 commit comments

Comments
 (0)