diff --git a/CHANGELOG.md b/CHANGELOG.md index 92d04ca3d0..fe73393c69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,29 @@ +#### v3.2.2 (2023-07-12) + +##### Chores + +* up themes (f1170b18) +* up spam-be-gone (eed34d04) +* remove log (509faa5e) +* incrementing version number - v3.2.1 (20145074) +* update changelog for v3.2.1 (c7f8cee9) +* incrementing version number - v3.2.0 (9ecac38e) +* incrementing version number - v3.1.7 (0b4e81ab) +* incrementing version number - v3.1.6 (b3a3b130) +* incrementing version number - v3.1.5 (ec19343a) +* incrementing version number - v3.1.4 (2452783c) +* incrementing version number - v3.1.3 (3b4e9d3f) +* incrementing version number - v3.1.2 (40fa3489) +* incrementing version number - v3.1.1 (40250733) +* incrementing version number - v3.1.0 (0cb386bd) +* incrementing version number - v3.0.1 (26f6ea49) +* incrementing version number - v3.0.0 (224e08cd) + +##### Bug Fixes + +* #11787 (6ae0df4f) +* #11786 fix selector for upgradable plugins (bf114c11) + #### v3.2.1 (2023-07-05) ##### Chores diff --git a/install/package.json b/install/package.json index 9feb51e2b1..8040ee1f13 100644 --- a/install/package.json +++ b/install/package.json @@ -101,7 +101,7 @@ "nodebb-plugin-ntfy": "1.0.15", "nodebb-plugin-spam-be-gone": "2.1.1", "nodebb-rewards-essentials": "0.2.3", - "nodebb-theme-harmony": "1.0.66", + "nodebb-theme-harmony": "1.0.65", "nodebb-theme-lavender": "7.1.1", "nodebb-theme-peace": "2.0.32", "nodebb-theme-persona": "13.1.8", diff --git a/public/language/en-GB/admin/settings/guest.json b/public/language/en-GB/admin/settings/guest.json index 44370e3668..a0062ef75a 100644 --- a/public/language/en-GB/admin/settings/guest.json +++ b/public/language/en-GB/admin/settings/guest.json @@ -1,6 +1,6 @@ { "settings": "Settings", - "guest-settings": "Guest settings", + "guest-settings": "Guest Settings", "handles.enabled": "Allow guest handles", "handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"", "topic-views.enabled": "Allow guests to increase topic view counts", diff --git a/public/language/en-GB/topic.json b/public/language/en-GB/topic.json index c789ed0340..162307c5b3 100644 --- a/public/language/en-GB/topic.json +++ b/public/language/en-GB/topic.json @@ -47,7 +47,7 @@ "wrote-ago": "wrote ", "wrote-on": "wrote on ", "replied-to-user-ago": "replied to %3 ", - "replied-to-user-on": "replied to %3 on ", + "replied-to-user-on": "replied to %3 on ", "user-locked-topic-ago": "%1 locked this topic %2", "user-locked-topic-on": "%1 locked this topic on %2", diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index 591ad5d22b..de7cd48096 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -13,13 +13,14 @@ define('admin/settings', [ const mainHader = $('[component="settings/main/header"]'); if (headers.length > 1 && tocList.length) { - headers.each(function () { - const header = $(this).text(); - const anchor = header.toLowerCase() - .replace(/ /g, '-') - .replace(/&/g, '-') - .trim(); - $(this).parent().attr('id', anchor); + headers.each(function (i) { + const $this = $(this); + const header = $this.text(); + const anchor = $this.parent().attr('id') || `section${i + 1}`; + // for elements that don't have id use section{index} + if (anchor.startsWith('section')) { + $this.parent().attr('id', anchor); + } tocList.append(`${header}`); }); const offset = mainHader.outerHeight(true); diff --git a/src/controllers/admin/uploads.js b/src/controllers/admin/uploads.js index 0f476c5c47..fc6ee9c1f1 100644 --- a/src/controllers/admin/uploads.js +++ b/src/controllers/admin/uploads.js @@ -68,14 +68,17 @@ function buildBreadcrumbs(currentFolder) { const crumbs = []; const parts = currentFolder.replace(nconf.get('upload_path'), '').split(path.sep); let currentPath = ''; - parts.forEach((part) => { + parts.forEach((part, i) => { const dir = path.join(currentPath, part); - crumbs.push({ + const crumb = { text: part || 'Uploads', - url: part ? + }; + if (i < parts.length - 1) { + crumb.url = part ? (`${nconf.get('relative_path')}/admin/manage/uploads?dir=${dir}`) : - `${nconf.get('relative_path')}/admin/manage/uploads`, - }); + `${nconf.get('relative_path')}/admin/manage/uploads`; + } + crumbs.push(crumb); currentPath = dir; }); diff --git a/src/middleware/render.js b/src/middleware/render.js index 71673b3052..3bbf6a6887 100644 --- a/src/middleware/render.js +++ b/src/middleware/render.js @@ -256,6 +256,7 @@ module.exports = function (middleware) { latestVersion: getLatestVersion(), privileges: privileges.admin.get(req.uid), tags: meta.tags.parse(req, {}, [], []), + languageDirection: translator.translate('[[language:dir]]', res.locals.config.acpLang), }); const { userData } = results; @@ -272,6 +273,7 @@ module.exports = function (middleware) { const version = nconf.get('version'); res.locals.config.userLang = res.locals.config.acpLang || res.locals.config.userLang; + res.locals.config.isRTL = results.languageDirection === 'rtl'; const templateValues = { config: res.locals.config, configJSON: jsesc(JSON.stringify(res.locals.config), { isScriptContext: true }), @@ -292,6 +294,9 @@ module.exports = function (middleware) { latestVersion: results.latestVersion, upgradeAvailable: results.latestVersion && semver.gt(results.latestVersion, version), showManageMenu: results.privileges.superadmin || ['categories', 'privileges', 'users', 'admins-mods', 'groups', 'tags', 'settings'].some(priv => results.privileges[`admin:${priv}`]), + defaultLang: meta.config.defaultLang || 'en-GB', + acpLang: res.locals.config.acpLang, + languageDirection: results.languageDirection, }; templateValues.template = { name: res.locals.template }; diff --git a/src/views/admin/advanced/logs.tpl b/src/views/admin/advanced/logs.tpl index 7184e4d98b..880f9e8d80 100644 --- a/src/views/admin/advanced/logs.tpl +++ b/src/views/admin/advanced/logs.tpl @@ -15,7 +15,7 @@
- 
{data}
+ 
{data}
diff --git a/src/views/admin/extend/widgets.tpl b/src/views/admin/extend/widgets.tpl index 2e119fcbc1..052c54fe4c 100644 --- a/src/views/admin/extend/widgets.tpl +++ b/src/views/admin/extend/widgets.tpl @@ -13,7 +13,7 @@ -