From c3e19005f6b18bfee734c9c17be3e7377d3e4208 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 1 Sep 2022 16:14:06 +0000 Subject: [PATCH 01/17] chore: incrementing version number - v2.5.0 --- install/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/package.json b/install/package.json index 79e284308a..0fa776a76a 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.4.5", + "version": "2.5.0", "homepage": "http://www.nodebb.org", "repository": { "type": "git", @@ -184,4 +184,4 @@ "url": "https://github.com/barisusakli" } ] -} +} \ No newline at end of file From 1076285dc9b1138e4499261ff00400c0447b0d08 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Thu, 1 Sep 2022 16:14:07 +0000 Subject: [PATCH 02/17] chore: update changelog for v2.5.0 --- CHANGELOG.md | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 425a480f12..f4a6960aae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,84 @@ +#### v2.5.0 (2022-09-01) + +##### Breaking Changes + +* reduce nodebb.min.js size by around 800kb (b7addffc) + +##### Chores + +* **i18n:** + * fallback strings for new resources: nodebb.admin-settings-reputation (e20433ec) + * fallback strings for new resources: nodebb.admin-settings-post (fcbbb4d6) + * fallback strings for new resources: nodebb.admin-advanced-cache (90fc50e1) +* move @textcomplete and its modules to composer-default (3cbb7a3d) +* remove client-side js file for tpl that no longer exists (bc2ea860) +* incrementing version number - v2.4.5 (dd3e1a28) +* update changelog for v2.4.5 (d505cc47) +* incrementing version number - v2.4.4 (d5525c87) +* incrementing version number - v2.4.3 (9c647c6c) +* incrementing version number - v2.4.2 (3aa7b855) +* update changelog for v2.4.1 (20a661e1) +* incrementing version number - v2.4.1 (fecf31bd) +* incrementing version number - v2.4.1 (60cbd148) +* incrementing version number - v2.4.0 (4834cde3) +* incrementing version number - v2.3.1 (d2425942) +* incrementing version number - v2.3.0 (046ea120) +* **deps:** + * update dependency eslint to v8.22.0 (#10835) (8fce68d3) + * update mongo docker tag to v3.7 (8afaed22) + * update docker/setup-qemu-action action to v2 (4aecf399) + * update redis docker tag to v2.8.23 (#10811) (269382e0) + * update redis docker tag to v2.8.23 (#10811) (59fd0efe) + +##### Documentation Changes + +* **openapi:** v3 spec for new user export routes (70652ad4) + +##### New Features + +* remove visibilityjs (#10870) (19207325) +* introduce ACP defined option to rescind notif or do nothing on flag resolve/reject (15b1561f) +* allow v3 api to handle 202 and 204 response codes as well. (0cda5aa3) +* don't show signatures again in pagination mode in same topic (0a6900fc) +* setting to show signatures only once in topics, closes #10071 (aba420a3) +* add event type to topic event component (bcb94ede) +* allow plugins to add to admin cache list (#10833) (a9bbb586) + +##### Bug Fixes + +* **deps:** + * update dependency compare-versions to v4.1.4 (884d4075) + * update dependency mongodb to v4.9.0 (e51004e2) + * update dependency lru-cache to v7.14.0 (d8a52f81) + * bump composer-default to v9 (81f8d84f) + * remove textcomplete in favour of @textcomplete/core (same package, just refactored) (b7bcc367) + * update dependency nodebb-theme-persona to v12.1.1 (#10838) (444b4d57) + * update dependency ace-builds to v1.9.5 (4c44d125) + * update dependency lru-cache to v7.13.2 (4ddc0c7a) + * update dependency nodemailer to v6.7.8 (dd385184) + * pin dependency @isaacs/ttlcache to 1.2.0 (150a7488) + * update dependency nodebb-plugin-composer-default to v8.0.1 (#10819) (9a7dd3a3) + * update dependency nodebb-plugin-composer-default to v8.0.1 (#10819) (69c87c2c) +* empty thread tools container on open (a088eb19) +* add dropup handler to thread tools menu, updated how post tools menu adds dropup handler (c1936e87) +* empty thread tools container on open (df36d967) +* add dropup handler to thread tools menu, updated how post tools menu adds dropup handler (3dd3cd82) +* removing duplicate session rerolling code (as it is in passport@^0.6 now) (65b3996a) +* don't crash if post is undefined (e06e526e) +* return at least one in sizeCalculation (#10832) (3975fa2e) + +##### Refactors + +* remove console.log (a2d0cd16) +* move export generation logic to v3 controller, GET/HEAD routes for exports (d0570518) +* use group.slug on acp group urls closes #8277 (14c79763) + +##### Tests + +* have some build tests not pollute build folder (7c5a915d) +* User.hidePrivateData (b424ba46) +* passport0.6 (#10638) (33458701) + #### v2.4.5 (2022-08-22) ##### Chores From 61d1e9e0d44cd7742eaacdca0bf01c1efe6530b7 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 2 Sep 2022 11:18:10 -0400 Subject: [PATCH 03/17] fix(deps): temporarily add back old textcomplete dependencies so emoji plugin can import them Revert this commit once the emoji plugin is patched so it refers to the newer textcomplete module --- install/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install/package.json b/install/package.json index 0fa776a76a..2792344528 100644 --- a/install/package.json +++ b/install/package.json @@ -129,6 +129,8 @@ "sortablejs": "1.15.0", "spdx-license-list": "6.6.0", "spider-detector": "2.0.0", + "textcomplete": "0.18.2", + "textcomplete.contenteditable": "0.1.1", "timeago": "1.6.7", "tinycon": "0.6.8", "toobusy-js": "0.5.1", From 67cb70352f994d8fab3477f0d753e0dd588bab70 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Fri, 2 Sep 2022 12:30:55 -0400 Subject: [PATCH 04/17] fix: missing escape on ACP category backgroundImage property --- src/categories/data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/data.js b/src/categories/data.js index d50e7e1a0b..4568d4850d 100644 --- a/src/categories/data.js +++ b/src/categories/data.js @@ -86,7 +86,7 @@ function modifyCategory(category, fields) { db.parseIntFields(category, intFields, fields); - const escapeFields = ['name', 'color', 'bgColor', 'imageClass', 'class', 'link']; + const escapeFields = ['name', 'color', 'bgColor', 'backgroundImage', 'imageClass', 'class', 'link']; escapeFields.forEach((field) => { if (category.hasOwnProperty(field)) { category[field] = validator.escape(String(category[field] || '')); From 2bf475299d0fdffce154979862ddba99cb56b0b5 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 2 Sep 2022 19:14:01 +0000 Subject: [PATCH 05/17] chore: incrementing version number - v2.5.1 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 2792344528..016c871122 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.5.0", + "version": "2.5.1", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 2b2fd4f34aef7a4a613c537ab6aaa7fdd92767c2 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 2 Sep 2022 19:14:02 +0000 Subject: [PATCH 06/17] chore: update changelog for v2.5.1 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4a6960aae..7d715d5795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +#### v2.5.1 (2022-09-02) + +##### Chores + +* incrementing version number - v2.5.0 (01d276cb) +* update changelog for v2.5.0 (1076285d) +* incrementing version number - v2.4.5 (dd3e1a28) +* incrementing version number - v2.4.4 (d5525c87) +* incrementing version number - v2.4.3 (9c647c6c) +* incrementing version number - v2.4.2 (3aa7b855) +* incrementing version number - v2.4.1 (60cbd148) +* incrementing version number - v2.4.0 (4834cde3) +* incrementing version number - v2.3.1 (d2425942) +* incrementing version number - v2.3.0 (046ea120) + +##### Bug Fixes + +* missing escape on ACP category backgroundImage property (67cb7035) +* **deps:** temporarily add back old textcomplete dependencies so emoji plugin can import them (61d1e9e0) + #### v2.5.0 (2022-09-01) ##### Breaking Changes From f6f37dc1cd06a1f3e96456b41217946115f768f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 4 Sep 2022 10:11:52 -0400 Subject: [PATCH 07/17] fix: registration regression, closes #10875 --- public/src/client/register.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/client/register.js b/public/src/client/register.js index 7bad263b0a..3178ee8359 100644 --- a/public/src/client/register.js +++ b/public/src/client/register.js @@ -2,7 +2,7 @@ define('forum/register', [ - 'translator', 'slugify', 'api', 'bootbox', 'forum/login', 'jquery-form', 'zxcvbn', + 'translator', 'slugify', 'api', 'bootbox', 'forum/login', 'zxcvbn', 'jquery-form', ], function (translator, slugify, api, bootbox, Login, zxcvbn) { const Register = {}; let validationError = false; From 1dc79d76a04cb015bc17d469a8ee30a59ff1da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 4 Sep 2022 10:32:22 -0400 Subject: [PATCH 08/17] test: disable nbbpm test temporarily --- test/controllers-admin.js | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/controllers-admin.js b/test/controllers-admin.js index 48137ddd81..347d8d27c6 100644 --- a/test/controllers-admin.js +++ b/test/controllers-admin.js @@ -241,18 +241,18 @@ describe('Admin Controllers', () => { done(); }); }); - - it('should load /admin/extend/plugins', function (done) { - this.timeout(50000); - request(`${nconf.get('url')}/api/admin/extend/plugins`, { jar: jar, json: true }, (err, res, body) => { - assert.ifError(err); - assert(body.hasOwnProperty('installed')); - assert(body.hasOwnProperty('upgradeCount')); - assert(body.hasOwnProperty('download')); - assert(body.hasOwnProperty('incompatible')); - done(); - }); - }); + // TODO: renable after nbbpm is fixed + // it('should load /admin/extend/plugins', function (done) { + // this.timeout(50000); + // request(`${nconf.get('url')}/api/admin/extend/plugins`, { jar: jar, json: true }, (err, res, body) => { + // assert.ifError(err); + // assert(body.hasOwnProperty('installed')); + // assert(body.hasOwnProperty('upgradeCount')); + // assert(body.hasOwnProperty('download')); + // assert(body.hasOwnProperty('incompatible')); + // done(); + // }); + // }); it('should load /admin/manage/users', (done) => { request(`${nconf.get('url')}/api/admin/manage/users`, { jar: jar, json: true }, (err, res, body) => { From b45e24139092af6c3d50851a31452b9d28953fdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 4 Sep 2022 10:36:57 -0400 Subject: [PATCH 09/17] lint: fix lint error --- test/controllers-admin.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/controllers-admin.js b/test/controllers-admin.js index 347d8d27c6..15dff752d7 100644 --- a/test/controllers-admin.js +++ b/test/controllers-admin.js @@ -241,19 +241,20 @@ describe('Admin Controllers', () => { done(); }); }); - // TODO: renable after nbbpm is fixed - // it('should load /admin/extend/plugins', function (done) { - // this.timeout(50000); - // request(`${nconf.get('url')}/api/admin/extend/plugins`, { jar: jar, json: true }, (err, res, body) => { - // assert.ifError(err); - // assert(body.hasOwnProperty('installed')); - // assert(body.hasOwnProperty('upgradeCount')); - // assert(body.hasOwnProperty('download')); - // assert(body.hasOwnProperty('incompatible')); - // done(); - // }); - // }); - + /* + TODO: renable after nbbpm is fixed + it('should load /admin/extend/plugins', function (done) { + this.timeout(50000); + request(`${nconf.get('url')}/api/admin/extend/plugins`, { jar: jar, json: true }, (err, res, body) => { + assert.ifError(err); + assert(body.hasOwnProperty('installed')); + assert(body.hasOwnProperty('upgradeCount')); + assert(body.hasOwnProperty('download')); + assert(body.hasOwnProperty('incompatible')); + done(); + }); + }); + */ it('should load /admin/manage/users', (done) => { request(`${nconf.get('url')}/api/admin/manage/users`, { jar: jar, json: true }, (err, res, body) => { assert.ifError(err); From e351fbe89c722d9035c473fdaa471f9f31b24324 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 4 Sep 2022 14:56:55 +0000 Subject: [PATCH 10/17] chore: incrementing version number - v2.5.2 --- install/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/package.json b/install/package.json index 016c871122..14a7e80dfb 100644 --- a/install/package.json +++ b/install/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPL-3.0", "description": "NodeBB Forum", - "version": "2.5.1", + "version": "2.5.2", "homepage": "http://www.nodebb.org", "repository": { "type": "git", From 84b6a7c7911e263b5edf4313f495e868882aa16f Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Sun, 4 Sep 2022 14:57:02 +0000 Subject: [PATCH 11/17] chore: update changelog for v2.5.2 --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d715d5795..8750e54acb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,31 @@ +#### v2.5.2 (2022-09-04) + +##### Chores + +* incrementing version number - v2.5.1 (ce3aa950) +* update changelog for v2.5.1 (2b2fd4f3) +* incrementing version number - v2.5.0 (01d276cb) +* incrementing version number - v2.4.5 (dd3e1a28) +* incrementing version number - v2.4.4 (d5525c87) +* incrementing version number - v2.4.3 (9c647c6c) +* incrementing version number - v2.4.2 (3aa7b855) +* incrementing version number - v2.4.1 (60cbd148) +* incrementing version number - v2.4.0 (4834cde3) +* incrementing version number - v2.3.1 (d2425942) +* incrementing version number - v2.3.0 (046ea120) + +##### Bug Fixes + +* registration regression, closes #10875 (f6f37dc1) + +##### Other Changes + +* fix lint error (b45e2413) + +##### Tests + +* disable nbbpm test temporarily (1dc79d76) + #### v2.5.1 (2022-09-02) ##### Chores From b392450c36a5498a031c5c46d8898b713fe22fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sun, 4 Sep 2022 12:00:27 -0400 Subject: [PATCH 12/17] perf: disable trending plugins, too slow due to nbbpm --- src/controllers/admin/plugins.js | 3 ++- src/views/admin/extend/plugins.tpl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/admin/plugins.js b/src/controllers/admin/plugins.js index a0b7457f01..e96cdf3cae 100644 --- a/src/controllers/admin/plugins.js +++ b/src/controllers/admin/plugins.js @@ -11,7 +11,8 @@ pluginsController.get = async function (req, res) { const [compatible, all, trending] = await Promise.all([ getCompatiblePlugins(), getAllPlugins(), - plugins.listTrending(), + Promise.resolve([]), + //plugins.listTrending(), ]); const compatiblePkgNames = compatible.map(pkgData => pkgData.name); diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl index 57a871ec3a..3c784a4e7d 100644 --- a/src/views/admin/extend/plugins.tpl +++ b/src/views/admin/extend/plugins.tpl @@ -3,7 +3,7 @@ {{{ end }}}