Skip to content

Commit 9aba84f

Browse files
committed
Merge branch '6.1' into 6.2
# Conflicts: # wcfsetup/install/files/js/3rdParty/ckeditor/ckeditor5.bundle.js # wcfsetup/install/files/js/WoltLabSuite/WebComponent.min.js # wcfsetup/install/files/lib/system/session/SessionHandler.class.php
2 parents 963c1fb + 1c329f0 commit 9aba84f

86 files changed

Lines changed: 192 additions & 130 deletions

Some content is hidden

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

ts/WoltLabSuite/Core/Component/User/RecentActivity/Loader.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ function initShowMoreButton(container: HTMLElement): void {
7575

7676
function initSwitchContextButtons(container: HTMLElement): void {
7777
container.querySelectorAll(".recentActivityList__switchContextButton").forEach((button) => {
78+
if (button.classList.contains("active")) {
79+
return;
80+
}
81+
7882
button.addEventListener(
7983
"click",
8084
promiseMutex(() => switchContext(container)),

wcfsetup/install/files/js/3rdParty/ckeditor/ckeditor5.bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/af.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/ar.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/ast.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/az.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/be.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/bg.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/bn.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wcfsetup/install/files/js/3rdParty/ckeditor/translations/bs.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)