From d35aad317d1afeb3e7ecaf1d1ef3c1b5934f2aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 2 May 2025 19:48:35 -0400 Subject: [PATCH 01/12] https://github.com/NodeBB/NodeBB/issues/13367 --- src/views/partials/topic/post-parent.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/partials/topic/post-parent.tpl b/src/views/partials/topic/post-parent.tpl index 98a2eec002..5e73f8cf70 100644 --- a/src/views/partials/topic/post-parent.tpl +++ b/src/views/partials/topic/post-parent.tpl @@ -5,7 +5,7 @@ {./parent.user.displayname} - +
{./parent.content}
From 18867fb14a810e261e89f4409e15864c40ae12da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Fri, 2 May 2025 19:49:56 -0400 Subject: [PATCH 02/12] chore: up themes --- install/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/package.json b/install/package.json index 2a1af9a8a4..88cef35d0b 100644 --- a/install/package.json +++ b/install/package.json @@ -107,10 +107,10 @@ "nodebb-plugin-spam-be-gone": "2.3.2", "nodebb-plugin-web-push": "0.7.4", "nodebb-rewards-essentials": "1.0.2", - "nodebb-theme-harmony": "2.1.11", + "nodebb-theme-harmony": "2.1.12", "nodebb-theme-lavender": "7.1.19", - "nodebb-theme-peace": "2.2.41", - "nodebb-theme-persona": "14.1.10", + "nodebb-theme-peace": "2.2.42", + "nodebb-theme-persona": "14.1.11", "nodebb-widget-essentials": "7.0.37", "nodemailer": "6.10.1", "nprogress": "0.2.0", From ee2f91ad988f256312c2a156f2b358fe4a8aaf0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 3 May 2025 14:36:20 -0400 Subject: [PATCH 03/12] chore: up widgets --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 88cef35d0b..c48bb812e0 100644 --- a/install/package.json +++ b/install/package.json @@ -111,7 +111,7 @@ "nodebb-theme-lavender": "7.1.19", "nodebb-theme-peace": "2.2.42", "nodebb-theme-persona": "14.1.11", - "nodebb-widget-essentials": "7.0.37", + "nodebb-widget-essentials": "7.0.38", "nodemailer": "6.10.1", "nprogress": "0.2.0", "passport": "0.7.0", From 2d15555e5c687dc00af1c39b8c30287f18ddadbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 5 May 2025 10:43:56 -0400 Subject: [PATCH 04/12] update tests to node 20/22 --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2554efe1bb..7ccb52ae62 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -27,19 +27,19 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - node: [18, 20] + node: [20, 22] database: [mongo-dev, mongo, redis, postgres] include: # only run coverage once - os: ubuntu-latest - node: 18 + node: 22 coverage: true # test under development once - database: mongo-dev test_env: development # only run eslint once - os: ubuntu-latest - node: 18 + node: 22 database: mongo-dev lint: true runs-on: ${{ matrix.os }} From 800426d68b91f0a8aeac9383f9728c9fb1588ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 5 May 2025 10:46:04 -0400 Subject: [PATCH 05/12] chore: node 18 eol --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index c48bb812e0..0cabe00a97 100644 --- a/install/package.json +++ b/install/package.json @@ -186,7 +186,7 @@ "url": "https://github.com/NodeBB/NodeBB/issues" }, "engines": { - "node": ">=18" + "node": ">=20" }, "maintainers": [ { From 7ef79981ddfdfebee8cea52799688bda0bebd57d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 5 May 2025 10:57:43 -0400 Subject: [PATCH 06/12] test: fix a test --- public/src/utils.common.js | 10 ++++++++-- test/utils.js | 10 +++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/public/src/utils.common.js b/public/src/utils.common.js index 66785a6467..0014b3ae85 100644 --- a/public/src/utils.common.js +++ b/public/src/utils.common.js @@ -507,9 +507,15 @@ const utils = { return str.toString().replace(escapeChars, replaceChar); }, - isAndroidBrowser: function () { + isAndroidBrowser: function (nua) { + if (!nua) { + if (typeof navigator !== 'undefined' && navigator.userAgent) { + nua = navigator.userAgent; + } else { + return false; + } + } // http://stackoverflow.com/questions/9286355/how-to-detect-only-the-native-android-browser - const nua = navigator.userAgent; return ((nua.indexOf('Mozilla/5.0') > -1 && nua.indexOf('Android ') > -1 && nua.indexOf('AppleWebKit') > -1) && !(nua.indexOf('Chrome') > -1)); }, diff --git a/test/utils.js b/test/utils.js index 68371c1afd..0af0de8bf6 100644 --- a/test/utils.js +++ b/test/utils.js @@ -285,18 +285,18 @@ describe('Utility Methods', () => { }); it('should return false if browser is not android', (done) => { - global.navigator = { + const navigator = { userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Safari/537.36', }; - assert.equal(utils.isAndroidBrowser(), false); + assert.equal(utils.isAndroidBrowser(navigator.userAgent), false); done(); }); it('should return true if browser is android', (done) => { - global.navigator = { - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Android /58.0.3029.96 Safari/537.36', + const navigator = { + userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Safari/537.36', }; - assert.equal(utils.isAndroidBrowser(), true); + assert.equal(utils.isAndroidBrowser(navigator.userAgent), true); done(); }); From 25979294e1ae59efb4d9a644aa73095c38914520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 5 May 2025 11:00:30 -0400 Subject: [PATCH 07/12] test: fix android test --- test/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils.js b/test/utils.js index 0af0de8bf6..b8bbaabe9c 100644 --- a/test/utils.js +++ b/test/utils.js @@ -294,7 +294,7 @@ describe('Utility Methods', () => { it('should return true if browser is android', (done) => { const navigator = { - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Safari/537.36', + userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Android/58.0.3029.96 Safari/537.36', }; assert.equal(utils.isAndroidBrowser(navigator.userAgent), true); done(); From 31af05c75aeec775385c94ca842a3b2b981adc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 5 May 2025 11:09:53 -0400 Subject: [PATCH 08/12] test: fix android test --- test/utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/utils.js b/test/utils.js index b8bbaabe9c..3e6338934c 100644 --- a/test/utils.js +++ b/test/utils.js @@ -294,7 +294,7 @@ describe('Utility Methods', () => { it('should return true if browser is android', (done) => { const navigator = { - userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Android/58.0.3029.96 Safari/537.36', + userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Android /58.0.3029.96 Safari/537.36', }; assert.equal(utils.isAndroidBrowser(navigator.userAgent), true); done(); From 9324a1937be24d8eb7ad057ee922e2dff37370eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20U=C5=9Fakl=C4=B1?= Date: Wed, 7 May 2025 11:28:33 -0400 Subject: [PATCH 09/12] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 67cde8daac..6c5d80e0fd 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Our minimalist "Harmony" theme gets you going right away, no coding experience r NodeBB requires the following software to be installed: -* A version of Node.js at least 18 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions)) +* A version of Node.js at least 20 or greater ([installation/upgrade instructions](https://github.com/nodesource/distributions)) * MongoDB, version 3.6 or greater **or** Redis, version 2.8.9 or greater * If you are using [clustering](https://docs.nodebb.org/configuring/scaling/) you need Redis installed and configured. * nginx, version 1.3.13 or greater (**only if** intending to use nginx to proxy requests to a NodeBB) From 130b93eca91f305cc2c7b95ec818ae637f76a4dc Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 7 May 2025 15:38:18 +0000 Subject: [PATCH 10/12] chore: incrementing version number - v4.3.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 0cabe00a97..9b6429f93e 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "4.3.0", + "version": "4.3.1", "homepage": "https://www.nodebb.org", "repository": { "type": "git", From 2310a7b835438db75c288282c6651dec7f75c0e7 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Wed, 7 May 2025 15:38:18 +0000 Subject: [PATCH 11/12] chore: update changelog for v4.3.1 --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91b6e9874b..cc3228268f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,36 @@ +#### v4.3.1 (2025-05-07) + +##### Chores + +* node 18 eol (800426d6) +* up widgets (ee2f91ad) +* up themes (18867fb1) +* update bundled plugins to use eslint9 (343f13e1) +* incrementing version number - v4.3.0 (bff291db) +* update changelog for v4.3.0 (76c03019) +* incrementing version number - v4.2.2 (17fecc24) +* incrementing version number - v4.2.1 (852a270c) +* incrementing version number - v4.2.0 (87581958) +* incrementing version number - v4.1.1 (b2afbb16) +* incrementing version number - v4.1.0 (36c80850) +* incrementing version number - v4.0.6 (4a52fb2e) +* incrementing version number - v4.0.5 (1792a62b) +* incrementing version number - v4.0.4 (b1125cce) +* incrementing version number - v4.0.3 (2b65c735) +* incrementing version number - v4.0.2 (73fe5fcf) +* incrementing version number - v4.0.1 (a461b758) +* incrementing version number - v4.0.0 (c1eaee45) + +##### Other Changes + +* //github.com/NodeBB/NodeBB/issues/13367 (d35aad31) + +##### Tests + +* fix android test (31af05c7) +* fix android test (25979294) +* fix a test (7ef79981) + #### v4.3.0 (2025-05-01) ##### Chores From 10077d0f89b4e3779f2e9217d5061d7d55f84240 Mon Sep 17 00:00:00 2001 From: Opliko Date: Thu, 8 May 2025 00:57:40 +0200 Subject: [PATCH 12/12] fix: correct stage name in dev dockerfile (#13393) Co-authored-by: ThisIsMissEm --- dev.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev.Dockerfile b/dev.Dockerfile index 4946d18725..b02384558a 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -58,8 +58,8 @@ RUN corepack enable \ && mkdir -p /usr/src/app/logs/ /opt/config/ \ && chown -R ${USER}:${USER} /usr/src/app/ /opt/config/ -COPY --from=build --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/ -COPY --from=build --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/ +COPY --from=git --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/install/docker/setup.json /usr/src/app/ +COPY --from=git --chown=${USER}:${USER} /usr/bin/tini /usr/src/app/install/docker/entrypoint.sh /usr/local/bin/ COPY --from=node_modules_touch --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/ COPY --from=git --chown=${USER}:${USER} /usr/src/app/ /usr/src/app/