From 2bf475299d0fdffce154979862ddba99cb56b0b5 Mon Sep 17 00:00:00 2001 From: Misty Release Bot Date: Fri, 2 Sep 2022 19:14:01 +0000 Subject: [PATCH 1/5] 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 2/5] 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 3/5] 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 4/5] 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 5/5] 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);