Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 08:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NodeBB/NodeBB

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2025-02-08 19:40:20 -05:00
parent f5328aa80c a8e7bf351a
commit 1090dbd85e
6 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/package.json
View File

@@ -108,7 +108,7 @@
"nodebb-plugin-spam-be-gone": "2.3.0",
"nodebb-plugin-web-push": "0.7.2",
"nodebb-rewards-essentials": "1.0.0",
"nodebb-theme-harmony": "2.0.17",
"nodebb-theme-harmony": "2.0.18",
"nodebb-theme-lavender": "7.1.17",
"nodebb-theme-peace": "2.2.38",
"nodebb-theme-persona": "14.0.14",

2
public/openapi/read/admin/config.yaml
View File

@@ -27,6 +27,8 @@ get:
type: string
keywords:
type: string
brand:logo:
type: string
titleLayout:
type: string
showSiteTitle:

2
public/openapi/read/config.yaml
View File

@@ -27,6 +27,8 @@ get:
type: string
keywords:
type: string
brand:logo:
type: string
titleLayout:
type: string
showSiteTitle:

10
public/src/admin/extend/plugins.js
View File

@@ -136,11 +136,13 @@ define('admin/extend/plugins', [
require(['compare-versions'], function (compareVersions) {
const currentVersion = parent.find('.currentVersion').text();
if (payload.version !== 'latest' && compareVersions.compare(payload.version, currentVersion, '>')) {
if (payload.version && payload.version !== 'latest' && compareVersions.compare(payload.version, currentVersion, '>')) {
upgrade(pluginID, btn, payload.version);
} else if (payload.version === 'latest') {
confirmInstall(pluginID, function () {
upgrade(pluginID, btn, payload.version);
} else if (payload.version === 'latest' || payload.version === null) {
confirmInstall(pluginID, function (confirm) {
if (confirm) {
upgrade(pluginID, btn, payload.version);
}
});
} else {
bootbox.alert(translator.compile('admin/extend/plugins:alert.incompatible', app.config.version, payload.version));

4
public/src/client/topic.js
View File

@@ -276,9 +276,13 @@ define('forum/topic', [
const parentEl = $(this);
const contentEl = parentEl.find('[component="post/parent/content"]');
if (contentEl.length) {
const isCollapsed = contentEl.hasClass('line-clamp-1');
contentEl.toggleClass('line-clamp-1');
parentEl.find('.timeago').toggleClass('hidden');
parentEl.toggleClass('flex-column').toggleClass('flex-row');
if (isCollapsed) {
return false;
}
} else {
return gotoPost(e, parentEl.attr('data-topid'));
}

1
src/controllers/api.js
View File

@@ -34,6 +34,7 @@ apiController.loadConfig = async function (req) {
browserTitle: validator.escape(String(meta.config.browserTitle || meta.config.title || 'NodeBB')),
description: validator.escape(String(meta.config.description || '')),
keywords: validator.escape(String(meta.config.keywords || '')),
'brand:logo': validator.escape(String(meta.config['brand:logo'])),
titleLayout: (meta.config.titleLayout || '{pageTitle} | {browserTitle}').replace(/{/g, '{').replace(/}/g, '}'),
showSiteTitle: meta.config.showSiteTitle === 1,
maintenanceMode: meta.config.maintenanceMode === 1,