Merge commit 'b45e24139092af6c3d50851a31452b9d28953fdd' into v2.x

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

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;

test/controllers-admin.js

@@ -241,7 +241,8 @@ 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) => {
@@ -253,7 +254,7 @@ describe('Admin Controllers', () => {
 			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);