Incrementing version number - v1.7.5

bump emoji to ^2.1.0
closes #6304
2025-12-17 14:00:29 +01:00 · 2018-02-12 12:25:46 -05:00 · 2018-02-12 12:24:07 -05:00 · 2018-02-05 10:06:03 -05:00 · 2018-01-30 11:12:26 -05:00 · 2018-01-24 21:14:43 +00:00
9 changed files with 42 additions and 45 deletions
--- a/install/package.json
+++ b/install/package.json
@@ -2,7 +2,7 @@
    "name": "nodebb",
    "license": "GPL-3.0",
    "description": "NodeBB Forum",
-    "version": "1.7.3",
+    "version": "1.7.5",
    "homepage": "http://www.nodebb.org",
    "repository": {
        "type": "git",
@@ -61,7 +61,7 @@
        "nconf": "^0.9.1",
        "nodebb-plugin-composer-default": "6.0.8",
        "nodebb-plugin-dbsearch": "2.0.9",
-        "nodebb-plugin-emoji": "2.0.9",
+        "nodebb-plugin-emoji": "^2.1.0",
        "nodebb-plugin-emoji-android": "2.0.0",
        "nodebb-plugin-markdown": "8.2.2",
        "nodebb-plugin-mentions": "2.2.2",
@@ -69,9 +69,6 @@
        "nodebb-plugin-spam-be-gone": "0.5.1",
        "nodebb-rewards-essentials": "0.0.11",
        "nodebb-theme-lavender": "5.0.1",
        "nodebb-theme-persona": "7.2.18",
        "nodebb-theme-slick": "1.1.4",
        "nodebb-theme-vanilla": "8.1.8",
        "nodebb-theme-persona": "7.2.16",
        "nodebb-theme-slick": "1.1.4",
        "nodebb-theme-vanilla": "8.1.7",
--- a/public/src/client/account/settings.js
+++ b/public/src/client/account/settings.js
@@ -55,7 +55,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
 			if (skinName === 'default') {
 				skinName = config.defaultBootswatchSkin;
 			}
-			var cssSource = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinName + '/bootstrap.min.css';
+			var cssSource = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinName + '/bootstrap.min.css';
 			if (css.length) {
 				css.attr('href', cssSource);
 			} else {
--- a/src/controllers/composer.js
+++ b/src/controllers/composer.js
@@ -10,13 +10,13 @@ var helpers = require('./helpers');
 exports.get = function (req, res, callback) {
 	async.waterfall([
-		function (next) {
+		function (_next) {
 			plugins.fireHook('filter:composer.build', {
 				req: req,
 				res: res,
 				next: callback,
 				templateData: {},
-			}, next);
+			}, _next);
 		},
 		function (data) {
 			if (data.templateData.disabled) {
--- a/src/middleware/header.js
+++ b/src/middleware/header.js
@@ -283,7 +283,7 @@ module.exports = function (middleware) {
 			}
 			if (skinToUse) {
-				obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinToUse + '/bootstrap.min.css';
+				obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinToUse + '/bootstrap.min.css';
 			}
 		}
 	}
--- a/src/upgrades/1.7.4/chat_privilege.js
+++ b/src/upgrades/1.7.4/chat_privilege.js
--- a/src/upgrades/1.7.4/fix_moved_topics_byvotes.js
+++ b/src/upgrades/1.7.4/fix_moved_topics_byvotes.js
--- a/src/upgrades/1.7.4/global_upload_privilege.js
+++ b/src/upgrades/1.7.4/global_upload_privilege.js
--- a/src/upgrades/1.7.4/rename_min_reputation_settings.js
+++ b/src/upgrades/1.7.4/rename_min_reputation_settings.js
--- a/src/upgrades/1.7.4/vote_privilege.js
+++ b/src/upgrades/1.7.4/vote_privilege.js
Author	SHA1	Message	Date
Julian Lam	7df191412d	Incrementing version number - v1.7.5	2018-02-12 12:25:46 -05:00
Andrew Rodrigues	277e6db409	bump emoji to ^2.1.0	2018-02-12 12:24:07 -05:00
Barış Soner Uşaklı	8c9bae8ba3	closes #6304	2018-02-05 10:06:03 -05:00
Julian Lam	11976b25d7	moved 1.8.0 upgrade scripts to 1.7.4 where they were actually released	2018-01-30 11:12:26 -05:00
Misty (Bot)	8e61d739c7	Incremented version number - v1.7.4	2018-01-24 21:14:43 +00:00
Misty (Bot)	e099dcf45c	Merge commit '813fdaf6f6b8cefa4fd7336d8888af9aefa01905' into v1.7.x	2018-01-24 21:14:43 +00:00
Peter Jaszkowiak	e16bec61d5	Hotfix for #6237	2018-01-15 13:03:43 -07:00
Julian Lam	dabb1e8d6d	bump persona	2018-01-03 12:50:47 -05:00
Julian Lam	748067e8c8	updated upgrade logic to not break ACP restart flow	2018-01-02 14:55:15 -05:00
Misty (Bot)	0020b8a18b	Incremented version number - v1.7.3	2017-12-27 21:48:01 +00:00
Misty (Bot)	368c387b6a	Merge commit 'f9202aeb05d4f12ec92881737ae31cb702a523df' into v1.7.x	2017-12-27 21:48:01 +00:00
Barış Soner Uşaklı	5ff5b6c699	revert _ sluggify change	2017-12-06 21:28:30 -05:00
Misty (Bot)	9ea1f25814	Incremented version number - v1.7.2	2017-12-06 20:18:52 +00:00
Misty (Bot)	383410ba83	Merge commit '94e8b2b38d588698fcaf3e1c856c2e65476aac53' into v1.7.x	2017-12-06 20:18:51 +00:00
Misty (Bot)	c4a8138ded	Incremented version number - 1.7.1	2017-11-29 20:38:53 +00:00
Misty (Bot)	a5e5f767ab	Merge commit 'a19537dc25e406a98048a561f45b3b321c9d3509' into v1.7.x	2017-11-29 20:38:03 +00:00
Barış Soner Uşaklı	97ac4a2e8c	backport composer route crash fix	2017-11-23 18:59:18 -05:00
Julian Lam	6cbeff34ea	v1.7.0 compatibility for slick theme	2017-11-21 11:32:36 -05:00
Misty (Bot)	6be3e7cc8c	Merge branch 'master' into v1.7.x	2017-11-15 20:00:48 +00:00
Misty (Bot)	87d621d944	Incremented version number - v1.7.0	2017-11-15 19:00:47 +00:00