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

Merge commit '285293c47be37233a85a5161c753e9763d41a813' into v3.x

Browse Source
This commit is contained in:
Misty Release Bot
2024-03-14 16:10:58 +00:00
parent 9a6153d71d 285293c47b
commit 580211bc1a
9 changed files with 259 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

228
CHANGELOG.md
View File

@@ -1,3 +1,231 @@
#### v3.7.0 (2024-03-06)
##### Chores
* **i18n:**
* fallback strings for new resources: nodebb.admin-settings-post, nodebb.topic (0bd0a740)
* fallback strings for new resources: nodebb.themes-harmony (8fb0ed82)
* fallback strings for new resources: nodebb.aria (a55fb29e)
* fallback strings for new resources: nodebb.aria (e6a358ed)
* fallback strings for new resources: nodebb.user (c88811a9)
* fallback strings for new resources: nodebb.topic (7e862a78)
* fallback strings for new resources: nodebb.topic, nodebb.unread (53ea10a7)
* fallback strings for new resources: nodebb.global (73e7d467)
* fallback strings for new resources: nodebb.topic (72f1e515)
* fallback strings for new resources: nodebb.global (642cd8e2)
* fallback strings for new resources: nodebb.global, nodebb.user (a998136c)
* fallback strings for new resources: nodebb.tags (4d35cb4e)
* fallback strings for new resources: nodebb.global, nodebb.themes-harmony (0bc9ac74)
* fallback strings for new resources: nodebb.global, nodebb.topic (a2819e9e)
* fallback strings for new resources: nodebb.error (9d5702f8)
* fallback strings for new resources: nodebb.admin-settings-reputation, nodebb.error (1230d22d)
* fallback strings for new resources: nodebb.admin-dashboard (f3974c0b)
* fallback strings for new resources: nodebb.search (43bf1f9b)
* up harmony (25ef62dc)
* up peace (3aaa0727)
* up peace (65f3c734)
* incrementing version number - v3.6.7 (86a17e38)
* update changelog for v3.6.7 (caf8722f)
* up harmony (22cd80b9)
* up themes (96fc20a3)
* up themes (421c7fc5)
* closes #12355 (fadee8d7)
* up themes (9ee864ce)
* up composer (8324adc5)
* up composer (0ff7adb4)
* incrementing version number - v3.6.6 (6604bf37)
* up themes (43a02c89)
* up themes (69342342)
* up harmony (9bbaef84)
* up harmony (35e98a9f)
* up harmony (22398d47)
* up themes (5cbb8bb1)
* up harmony (3f3f0d66)
* up harmony (4f42172d)
* up harmony (c0db10af)
* up harmony (0743cb3c)
* incrementing version number - v3.6.5 (6c653625)
* up harmony (09414efa)
* incrementing version number - v3.6.4 (83d131b4)
* incrementing version number - v3.6.3 (fc7d2bfd)
* up harmony (bbdefad3)
* incrementing version number - v3.6.2 (0f577a57)
* up themes (79ebbee5)
* incrementing version number - v3.6.1 (f1a69468)
* up composer (c31e321b)
* incrementing version number - v3.6.0 (4cdf85f8)
* incrementing version number - v3.5.3 (ed0e8783)
* incrementing version number - v3.5.2 (52fbb2da)
* incrementing version number - v3.5.1 (4c543488)
* incrementing version number - v3.5.0 (d06fb4f0)
* incrementing version number - v3.4.3 (5c984250)
* incrementing version number - v3.4.2 (3f0dac38)
* incrementing version number - v3.4.1 (01e69574)
* incrementing version number - v3.4.0 (fd9247c5)
* incrementing version number - v3.3.9 (5805e770)
* incrementing version number - v3.3.8 (a5603565)
* incrementing version number - v3.3.7 (b26f1744)
* incrementing version number - v3.3.6 (7fb38792)
* incrementing version number - v3.3.4 (a67f84ea)
* incrementing version number - v3.3.3 (f94d239b)
* incrementing version number - v3.3.2 (ec9dac97)
* incrementing version number - v3.3.1 (151cc68f)
* incrementing version number - v3.3.0 (fc1ad70f)
* incrementing version number - v3.2.3 (b06d3e63)
* incrementing version number - v3.2.2 (758ecfcd)
* incrementing version number - v3.2.1 (20145074)
* 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)
* **deps:**
* update commitlint monorepo to v19 (#12369) (516c8d04)
* update dependency smtp-server to v3.13.3 (#12378) (0ab1982c)
* update dependency eslint to v8.57.0 (#12362) (6c33c01d)
* update dependency sass-embedded to v1.71.1 (#12350) (99ad9d38)
* update dependency sass-embedded to v1.71.0 (#12344) (920f787f)
* update postgres docker tag to v16.2 (#12338) (254bad89)
* update commitlint monorepo to v18.6.1 (#12339) (92ef8548)
* update dependency mocha to v10.3.0 (#12334) (9cd299db)
* update dependency smtp-server to v3.13.2 (#12324) (048e664c)
* update dependency lint-staged to v15.2.2 (#12327) (a7008fb3)
* update dependency lint-staged to v15.2.1 (#12319) (264e71d2)
* update commitlint monorepo to v18.6.0 (#12305) (7e7bbfa4)
* update dependency jsdom to v24 (#12294) (45f02ff0)
* update commitlint monorepo to v18.5.0 (#12296) (5a776f9f)
* update dependency sass-embedded to v1.70.0 (#12286) (0063dd45)
* update dependency jsdom to v23.2.0 (#12269) (7cc69df0)
* update dependency jsdom to v23.1.0 (#12265) (12aeb6f7)
* update commitlint monorepo to v18.4.4 (#12261) (b25dfd47)
* update dependency sass-embedded to v1.69.7 (#12257) (ce78cb0e)
* update dependency sass-embedded to v1.69.6 (#12249) (1777ec4b)
##### New Features
* add new sorting option to categories (2a9b0a3c)
* add chat widget areas, closes #12375 (53b3c5d6)
* add hook into user.posts.isReady (7207814b)
* refactor group title editing (112493fa)
* cli command for maintenance mode closes #12293 (80960296)
* fallbacks for aria.json (19bc442b)
* add new lang keys for a11y (3ce89d1e)
* add missing aria/role attributes to dropdown elements (7917fd82)
* add lang keys for hidden labels (e298fb6b)
* show unread categories based on unread topics (#12317) (45cfb369)
* limit post/user flags per day closes #12274 (2b1fdc56)
* search in bookmarks on search page (5213e22a)
* #12247 (c5730b36)
##### Bug Fixes
* #12389, update privilege group check (87a79059)
* dupe id (f4b63790)
* #12357, properly update lists and counters (f34ebcc9)
* use lang key for user avatar label (863f5d0a)
* spec (4bcbf759)
* move winston logging for plugin hook firing to debug level (e240d0f9)
* closes #12326 (9302d9b4)
* some layout fixes for group details page (301eee17)
* bookmark in topic data is nullable now (d500ebb1)
* bug where body wasn't properly sent on ap-style content-types (4b87c30f)
* dont send topic notification to poster (c2239e48)
* **deps:**
* update dependency nodebb-theme-harmony to v1.2.36 (#12392) (db2f7c03)
* update dependency nodebb-theme-peace to v2.2.4 (#12381) (073a79eb)
* update dependency mongodb to v6.4.0 (#12382) (716482b2)
* update dependency nodebb-plugin-mentions to v4.4.0 (#12385) (6f04859e)
* update dependency ace-builds to v1.32.7 (#12386) (9eb54394)
* update dependency autoprefixer to v10.4.18 (#12387) (339e2cfa)
* update dependency nodebb-theme-harmony to v1.2.35 (#12388) (7b1b4510)
* update dependency nodebb-theme-harmony to v1.2.34 (#12383) (430c6b6c)
* update dependency nodemailer to v6.9.11 (#12380) (aa6859df)
* update dependency express to v4.18.3 (#12379) (2c3540b2)
* update dependency nodebb-plugin-markdown to v12.2.6 (#12371) (fb98dc05)
* update dependency archiver to v7 (#12374) (9de0ab31)
* update dependency chart.js to v4.4.2 (#12376) (131d2fe7)
* update dependency bootswatch to v5.3.3 (#12373) (1ed4d763)
* update dependency fetch-cookie to v3.0.1 (#12363) (835820a0)
* update dependency sanitize-html to v2.12.1 (#12360) (00bcf935)
* update dependency spdx-license-list to v6.9.0 (#12354) (b58dde1c)
* update dependency sass to v1.71.1 (#12351) (3094996b)
* update dependency sanitize-html to v2.12.0 (#12353) (ee90866a)
* update dependency nodemailer to v6.9.10 (#12356) (80ea6eb9)
* update dependency bootstrap to v5.3.3 (#12348) (4007882b)
* update dependency sass to v1.71.0 (#12345) (faf5a9c8)
* update dependency esbuild to v0.20.1 (#12346) (a0021b1d)
* update dependency webpack to v5.90.3 (#12347) (748bbab0)
* update dependency nodebb-plugin-spam-be-gone to v2.2.1 (#12343) (acad7317)
* update dependency webpack to v5.90.2 (#12341) (cb6fe9c7)
* update dependency nodebb-theme-harmony to v1.2.25 (#12340) (99474a7e)
* update dependency commander to v12 (#12325) (b61486eb)
* update dependency diff to v5.2.0 (#12337) (d0f6f0cc)
* update dependency postcss to v8.4.35 (#12333) (3bc506f6)
* update dependency ace-builds to v1.32.6 (#12332) (523f7ace)
* update dependency postcss to v8.4.34 (#12330) (9d036be3)
* update dependency semver to v7.6.0 (#12328) (3af04956)
* update dependency fetch-cookie to v2.2.0 (#12323) (b56d6a88)
* update dependency nodebb-theme-harmony to v1.2.12 (#12318) (65fead81)
* update dependency webpack to v5.90.1 (#12322) (98b455ce)
* update dependency nodemailer to v6.9.9 (#12321) (3f74cca3)
* update dependency ace-builds to v1.32.5 (#12316) (ef06be6d)
* update dependency nodebb-theme-harmony to v1.2.10 (#12314) (d648972c)
* update dependency ace-builds to v1.32.4 (#12313) (9fb7c163)
* update dependency express-session to v1.18.0 (#12311) (6444eeb9)
* update dependency esbuild to v0.20.0 (#12309) (aa1344fc)
* update dependency nodebb-theme-harmony to v1.2.8 (#12310) (fd20e3a5)
* update dependency nodebb-theme-harmony to v1.2.7 (#12307) (eabbf195)
* update dependency lru-cache to v10.2.0 (#12306) (400a1aa3)
* update dependency webpack to v5.90.0 (#12303) (44a798bc)
* update dependency esbuild to v0.19.12 (#12302) (72bb81f0)
* update dependency connect-redis to v7.1.1 (#12298) (575f072a)
* update dependency nodebb-theme-harmony to v1.2.6 (#12300) (e1adf5b3)
* update dependency nodebb-widget-essentials to v7.0.15 (#12295) (876fa4a7)
* update dependency nodebb-theme-persona to v13.3.3 (#12290) (f8893cd8)
* update dependency nodebb-theme-harmony to v1.2.4 (#12292) (e33e9dea)
* update dependency autoprefixer to v10.4.17 (#12285) (9e11b927)
* update dependency workerpool to v9.1.0 (#12288) (7a24961d)
* update dependency sass to v1.70.0 (#12287) (a1cdec08)
* update dependency sortablejs to v1.15.2 (#12283) (cc93caff)
* update dependency nodebb-theme-persona to v13.3.2 (#12284) (91ce17c7)
* update dependency nodebb-theme-harmony to v1.2.3 (#12280) (34a8069b)
* update dependency nodebb-theme-persona to v13.3.1 (#12281) (fe0845b9)
* update dependency nodebb-theme-harmony to v1.2.2 (#12279) (fc78b00c)
* update socket.io packages to v4.7.4 (#12278) (16598f7f)
* update dependency postcss to v8.4.33 (#12264) (3a32fc8f)
* update dependency nodebb-theme-harmony to v1.1.108 (#12263) (4924d170)
* update socket.io packages to v4.7.3 (#12259) (eb7a3091)
* update dependency sass to v1.69.7 (#12258) (d5dc4655)
* update dependency nodemailer to v6.9.8 (#12254) (1953a635)
* update dependency esbuild to v0.19.11 (#12253) (c8007bf6)
* update dependency ace-builds to v1.32.3 (#12252) (c40b2322)
* update dependency sass to v1.69.6 (#12250) (f8a0cb9e)
* update dependency terser-webpack-plugin to v5.3.10 (#12248) (9101caff)
* update dependency workerpool to v9.0.4 (#12244) (8165f454)
* update dependency workerpool to v9.0.3 (#12238) (3e08ef81)
* update dependency esbuild to v0.19.10 (#12237) (6ef8e767)
##### Other Changes
* fix (f5586968)
##### Refactors
* move tomap inside (5e89dfad)
* shorter tag translation (a9e8c184)
* search stats (82f6721d)
##### Tests
* fix test (c8a5e24a)
* update test (5afc735b)
#### v3.6.7 (2024-02-28)
##### Chores

4
install/package.json
View File

@@ -88,7 +88,7 @@
"lru-cache": "10.2.0",
"mime": "3.0.0",
"mkdirp": "3.0.1",
"mongodb": "6.4.0",
"mongodb": "6.5.0",
"morgan": "1.10.0",
"mousetrap": "1.6.5",
"multiparty": "4.2.3",
@@ -103,7 +103,7 @@
"nodebb-plugin-ntfy": "1.7.3",
"nodebb-plugin-spam-be-gone": "2.2.1",
"nodebb-rewards-essentials": "1.0.0",
"nodebb-theme-harmony": "1.2.37",
"nodebb-theme-harmony": "1.2.40",
"nodebb-theme-lavender": "7.1.7",
"nodebb-theme-peace": "2.2.4",
"nodebb-theme-persona": "13.3.11",

4
loader.js
View File

@@ -99,7 +99,9 @@ Loader.start = function () {
function forkWorker(index, isPrimary) {
const ports = getPorts();
const args = [];
if (nconf.get('max-memory')) {
args.push(`--max-old-space-size=${nconf.get('max-memory')}`);
}
if (!ports[index]) {
return console.log(`[cluster] invalid port for worker : ${index} ports: ${ports.length}`);
}

1
public/scss/admin/admin.scss
View File

@@ -18,6 +18,7 @@
@import "settings";
@import "../modules/alerts";
@import "../modules/scrollbar.scss";
@import "./modules/selectable";
@import "./modules/nprogress";
@import "./modules/search";

3
public/scss/client.scss
View File

@@ -7,4 +7,5 @@
@import "modules/picture-switcher";
@import "modules/bottom-sheet";
@import "modules/icon-picker";
@import "modules/alerts.scss";
@import "modules/alerts.scss";
@import "modules/scrollbar.scss";

19
public/scss/modules/scrollbar.scss Normal file
View File

@@ -0,0 +1,19 @@
.ghost-scrollbar {
&::-webkit-scrollbar {
width: 10px;
}
&::-webkit-scrollbar-track {
border-radius: 8px;
background-color: $gray-200;
border: none;
}
&::-webkit-scrollbar-thumb {
border-radius: 8px;
border: 2px solid transparent;
background-clip: content-box;
background-color: $gray-500;
}
}

1
src/topics/create.js
View File

@@ -46,6 +46,7 @@ module.exports = function (Topics) {
const timestampedSortedSetKeys = [
'topics:tid',
`cid:${topicData.cid}:tids`,
`cid:${topicData.cid}:tids:create`,
`cid:${topicData.cid}:uid:${topicData.uid}:tids`,
];

4
src/views/chats.tpl
View File

@@ -34,7 +34,7 @@
<hr class="my-1">
<div class="d-flex flex-column gap-1 overflow-auto">
{{{ if publicRooms.length }}}
{{{ if rooms.length }}}
<div class="d-flex gap-1 align-items-center justify-content-between justify-content-lg-start">
<button class="btn-ghost-sm p-1 order-1 order-lg-0" data-bs-toggle="collapse" data-bs-target="#private-rooms"
onclick="$(this).find('i').toggleClass('fa-rotate-180')"><i class="fa fa-fw fa-chevron-up" style="transition: 0.25s ease;"></i></button>
@@ -42,7 +42,7 @@
</div>
{{{ end }}}
<div id="private-rooms" component="chat/recent" class="chats-list overflow-auto mb-0 pe-1 pb-5 pb-lg-0 collapse show" data-nextstart="{nextStart}">
<div id="private-rooms" component="chat/recent" class="chats-list overflow-auto mb-0 pe-1 pb-5 pb-lg-0 collapse show ghost-scrollbar" data-nextstart="{nextStart}">
{{{ each rooms }}}
<!-- IMPORT partials/chats/recent_room.tpl -->
{{{ end }}}

2
src/views/partials/chats/message-window.tpl
View File

@@ -24,7 +24,7 @@
<hr class="my-1"/>
<div class="d-flex flex-grow-1 gap-1 overflow-auto" style="min-width: 0px;">
<div component="chat/messages" class="expanded-chat d-flex flex-column flex-grow-1" data-roomid="{roomId}" style="min-width: 0px;">
<ul component="chat/message/content" class="chat-content p-0 m-0 list-unstyled overflow-auto flex-grow-1">
<ul component="chat/message/content" class="chat-content p-0 m-0 list-unstyled overflow-auto flex-grow-1 ghost-scrollbar">
<!-- IMPORT partials/chats/messages.tpl -->
</ul>
<ul component="chat/message/search/results" class="chat-content p-0 m-0 list-unstyled overflow-auto flex-grow-1 hidden">