From 1e651aed3570383ec1492e87af0fa592cbf300f3 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 18 Mar 2016 12:13:29 -0400
Subject: [PATCH 01/67] #4377

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7eb551e233..fb4e717bf0 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.9",
+    "nodebb-plugin-composer-default": "3.0.10",
     "nodebb-plugin-dbsearch": "1.0.0",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",

From f7e43877482f6efc276ea71e61d7c7524a8f5a44 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 18 Mar 2016 12:24:51 -0400
Subject: [PATCH 02/67] closes #4380

---
 src/meta/blacklist.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/meta/blacklist.js b/src/meta/blacklist.js
index b0269a1f0c..47381e487b 100644
--- a/src/meta/blacklist.js
+++ b/src/meta/blacklist.js
@@ -78,16 +78,24 @@ Blacklist.validate = function(rules, callback) {
 	var cidr = [];
 	var invalid = [];
 
-	var isCidrSubnet = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/;
+	var isCidrSubnet = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\/([0-9]|[1-2][0-9]|3[0-2]))$/,
+		inlineCommentMatch = /#.*$/,
+		whitelist = ['127.0.0.1', '::1', '::ffff:0:127.0.0.1'];
 
 	// Filter out blank lines and lines starting with the hash character (comments)
+	// Also trim inputs and remove inline comments
 	rules = rules.map(function(rule) {
-		rule = rule.trim();
+		rule = rule.replace(inlineCommentMatch, '').trim();
 		return rule.length && !rule.startsWith('#') ? rule : null;
 	}).filter(Boolean);
 
 	// Filter out invalid rules
 	rules = rules.filter(function(rule) {
+		if (whitelist.indexOf(rule) !== -1) {
+			invalid.push(rule);
+			return false;
+		}
+
 		if (ip.isV4Format(rule)) {
 			ipv4.push(rule);
 			return true;

From c9f285a883104cb87802fae8c5d321dea8154680 Mon Sep 17 00:00:00 2001
From: NodeBB Misty <deploy@nodebb.org>
Date: Fri, 18 Mar 2016 13:46:58 -0400
Subject: [PATCH 03/67] bumped up version

Conflicts:
	package.json
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fb4e717bf0..594892df75 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",

From b9b8f2320fe0ea7d28d6292252fc775180e2292e Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 19 Mar 2016 10:36:39 +0200
Subject: [PATCH 04/67] up composer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 594892df75..997e4c7399 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.10",
+    "nodebb-plugin-composer-default": "3.0.11",
     "nodebb-plugin-dbsearch": "1.0.0",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",

From e556ae93ea04ecd77c0b03c583d54a68c9c7511f Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Sat, 19 Mar 2016 10:47:05 +0200
Subject: [PATCH 05/67] up mentions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 997e4c7399..75fb36119c 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "nodebb-plugin-dbsearch": "1.0.0",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",
-    "nodebb-plugin-mentions": "1.0.18",
+    "nodebb-plugin-mentions": "1.0.19",
     "nodebb-plugin-soundpack-default": "0.1.6",
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",

From d6549785080a2874c17de5cfc02db063e2b25b5c Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 20 Mar 2016 15:07:11 -0500
Subject: [PATCH 06/67] show the crossed-out eye icon for users who want their
 email private for staff, not just the user

---
 src/controllers/accounts/helpers.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index 0a35315854..1cb7bb3c77 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -64,12 +64,14 @@ helpers.getUserDataByUserSlug = function(userslug, callerUID, callback) {
 			userData.lastonlineISO = utils.toISOString(userData.lastonline || userData.joindate);
 			userData.age = Math.max(0, userData.birthday ? Math.floor((new Date().getTime() - new Date(userData.birthday).getTime()) / 31536000000) : 0);
 
+			userData.emailClass = 'hide';
+
 			if (!(isAdmin || isGlobalModerator || self || (userData.email && userSettings.showemail))) {
 				userData.email = '';
+			} else if (!userSettings.showemail) {
+				userData.emailClass = '';
 			}
 
-			userData.emailClass = (self && !userSettings.showemail) ? '' : 'hide';
-
 			if (!isAdmin && !isGlobalModerator && !self && !userSettings.showfullname) {
 				userData.fullname = '';
 			}
@@ -172,4 +174,4 @@ function filterLinks(links, self) {
 	});
 }
 
-module.exports = helpers;
\ No newline at end of file
+module.exports = helpers;

From 3c607f2612d66000ae993c60d3f97df63f4d715e Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 20 Mar 2016 15:11:32 -0500
Subject: [PATCH 07/67] fix two crashes

---
 src/controllers/helpers.js | 4 ++--
 src/middleware/render.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 94dfe022c2..3962e2036b 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -41,7 +41,7 @@ helpers.redirect = function(res, url) {
 	if (res.locals.isAPI) {
 		res.status(308).json(url);
 	} else {
-		res.redirect(nconf.get('relative_path') + url);
+		res.redirect(nconf.get('relative_path') + encodeURI(url));
 	}
 };
 
@@ -109,4 +109,4 @@ helpers.buildTitle = function(pageTitle) {
 	return title;
 };
 
-module.exports = helpers;
\ No newline at end of file
+module.exports = helpers;
diff --git a/src/middleware/render.js b/src/middleware/render.js
index 2a9d0ba5d2..79911f71bd 100644
--- a/src/middleware/render.js
+++ b/src/middleware/render.js
@@ -13,7 +13,7 @@ module.exports = function(middleware) {
 				req = this.req,
 				defaultFn = function(err, str){
 					if (err) {
-						return req.next(err);
+						return next(err);
 					}
 
 					self.send(str);
@@ -96,4 +96,4 @@ module.exports = function(middleware) {
 		return parts.join(' ');
 	}
 
-};
\ No newline at end of file
+};

From bb88c82ffd08c14133be349e085706e80a2d2ed6 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 20 Mar 2016 15:59:38 -0500
Subject: [PATCH 08/67] fix post tools not showing up for other users on new
 posts (src/topics/posts.js has this condition already)

---
 public/src/client/topic/posts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index f534aefad5..d479196c24 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -26,7 +26,7 @@ define('forum/topic/posts', [
 			post.selfPost = !!app.user.uid && parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
 			post.display_moderator_tools = post.selfPost || ajaxify.data.privileges.isAdminOrMod;
 			post.display_move_tools = ajaxify.data.privileges.isAdminOrMod;
-			post.display_post_menu = post.selfPost || ajaxify.data.privileges.isAdminOrMod;
+			post.display_post_menu = post.selfPost || ajaxify.data.privileges.isAdminOrMod || !post.deleted;
 		});
 
 		updatePostCounts(data.posts);
@@ -262,4 +262,4 @@ define('forum/topic/posts', [
 
 	return Posts;
 
-});
\ No newline at end of file
+});

From 44431f8410ed6233fc82be5f76b1140d6330a22e Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Sun, 20 Mar 2016 16:26:13 -0500
Subject: [PATCH 09/67] fix notifications that contain topic titles with commas
 in them

---
 src/notifications.js        |  7 +++++--
 src/socket.io/helpers.js    | 13 ++++++++++---
 src/socket.io/posts/flag.js |  8 ++++++--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/notifications.js b/src/notifications.js
index af88fd7b5b..f32ca031d3 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -450,10 +450,13 @@ var async = require('async'),
 						});
 						var numUsers = usernames.length;
 
+						var title = S(notifications[modifyIndex].topicTitle).decodeHTMLEntities().s;
+						var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
+
 						if (numUsers === 2) {
-							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + ', ' + notifications[modifyIndex].topicTitle + ']]';
+							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + ', ' + titleEscaped + ']]';
 						} else if (numUsers > 2) {
-							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers-1) + ', ' + notifications[modifyIndex].topicTitle + ']]';
+							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers-1) + ', ' + titleEscaped + ']]';
 						}
 						break;
 
diff --git a/src/socket.io/helpers.js b/src/socket.io/helpers.js
index 3aeaaf0bf3..5524faf156 100644
--- a/src/socket.io/helpers.js
+++ b/src/socket.io/helpers.js
@@ -2,6 +2,7 @@
 
 var async = require('async');
 var winston = require('winston');
+var S = require('string');
 var nconf = require('nconf');
 
 var websockets = require('./index');
@@ -62,8 +63,11 @@ SocketHelpers.sendNotificationToPostOwner = function(pid, fromuid, notification)
 				return;
 			}
 
+			var title = S(results.topicTitle).decodeHTMLEntities().s;
+			var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
+
 			notifications.create({
-				bodyShort: '[[' + notification + ', ' + results.username + ', ' + results.topicTitle + ']]',
+				bodyShort: '[[' + notification + ', ' + results.username + ', ' + titleEscaped + ']]',
 				bodyLong: results.postObj.content,
 				pid: pid,
 				nid: 'post:' + pid + ':uid:' + fromuid,
@@ -93,8 +97,11 @@ SocketHelpers.sendNotificationToTopicOwner = function(tid, fromuid, notification
 			return;
 		}
 
+		var title = S(results.topicData.title).decodeHTMLEntities().s;
+		var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
+
 		notifications.create({
-			bodyShort: '[[' + notification + ', ' + results.username + ', ' + results.topicData.title + ']]',
+			bodyShort: '[[' + notification + ', ' + results.username + ', ' + titleEscaped + ']]',
 			path: nconf.get('relative_path') + '/topic/' + results.topicData.slug,
 			nid: 'tid:' + tid + ':uid:' + fromuid,
 			from: fromuid
@@ -111,4 +118,4 @@ SocketHelpers.emitToTopicAndCategory = function(event, data) {
 	websockets.in('category_' + data.cid).emit(event, data);
 };
 
-module.exports = SocketHelpers;
\ No newline at end of file
+module.exports = SocketHelpers;
diff --git a/src/socket.io/posts/flag.js b/src/socket.io/posts/flag.js
index eaefcea1e2..bbf7a4721c 100644
--- a/src/socket.io/posts/flag.js
+++ b/src/socket.io/posts/flag.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var async = require('async');
+var S = require('string');
 
 var user = require('../../user');
 var groups = require('../../groups');
@@ -82,8 +83,11 @@ module.exports = function(SocketPosts) {
 				}, next);
 			},
 			function (results, next) {
+				var title = S(post.topic.title).decodeHTMLEntities().s;
+				var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
+
 				notifications.create({
-					bodyShort: '[[notifications:user_flagged_post_in, ' + flaggingUser.username + ', ' + post.topic.title + ']]',
+					bodyShort: '[[notifications:user_flagged_post_in, ' + flaggingUser.username + ', ' + titleEscaped + ']]',
 					bodyLong: post.content,
 					pid: data.pid,
 					nid: 'post_flag:' + data.pid + ':uid:' + socket.uid,
@@ -163,4 +167,4 @@ module.exports = function(SocketPosts) {
 			},
 		], callback);
 	};
-};
\ No newline at end of file
+};

From 497592965f64996e902c7dd35f513b79fd2abe66 Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Sun, 20 Mar 2016 22:09:10 +0000
Subject: [PATCH 10/67] fixes issue-4386

---
 public/src/admin/manage/group.js | 2 +-
 src/views/admin/manage/group.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index 58c5017540..5cc5eb2048 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -98,7 +98,7 @@ define('admin/manage/group', [
 
 				templates.parse('partials/groups/memberlist', 'members', {group: {isOwner: ajaxify.data.group.isOwner, members: [member]}}, function(html) {
 					translator.translate(html, function(html) {
-						$('[component="groups/members"] tr').first().before(html);
+						$('[component="groups/members"]').prepend(html);
 					});
 				});
 			});
diff --git a/src/views/admin/manage/group.tpl b/src/views/admin/manage/group.tpl
index f579065df5..a50fdba51b 100644
--- a/src/views/admin/manage/group.tpl
+++ b/src/views/admin/manage/group.tpl
@@ -63,7 +63,7 @@
 				<fieldset>
 					<div class="checkbox">
 						<label>
-							<input id="group-hidden" name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->> <strong>[Hidden</strong>
+							<input id="group-hidden" name="hidden" type="checkbox"<!-- IF group.hidden --> checked<!-- ENDIF group.hidden -->> <strong>Hidden</strong>
 							<p class="help-block">
 								If enabled, this group will not be found in the groups listing, and users will have to be invited manually
 							</p>

From 9c9e49e2f60dc50ad0917e4f63f143998aaf5a42 Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Sun, 20 Mar 2016 22:20:55 +0000
Subject: [PATCH 11/67] properly fix with styling

---
 public/src/admin/manage/group.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/admin/manage/group.js b/public/src/admin/manage/group.js
index 5cc5eb2048..06284e4e88 100644
--- a/public/src/admin/manage/group.js
+++ b/public/src/admin/manage/group.js
@@ -98,7 +98,7 @@ define('admin/manage/group', [
 
 				templates.parse('partials/groups/memberlist', 'members', {group: {isOwner: ajaxify.data.group.isOwner, members: [member]}}, function(html) {
 					translator.translate(html, function(html) {
-						$('[component="groups/members"]').prepend(html);
+						$('[component="groups/members"] tbody').prepend(html);
 					});
 				});
 			});

From e5188ee05b7e3a5d5c53babcc3fc0c949603bd04 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 09:43:18 +0200
Subject: [PATCH 12/67] up mentions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 75fb36119c..bf83707c69 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "nodebb-plugin-dbsearch": "1.0.0",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",
-    "nodebb-plugin-mentions": "1.0.19",
+    "nodebb-plugin-mentions": "1.0.20",
     "nodebb-plugin-soundpack-default": "0.1.6",
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",

From 4eb7468dcdef86c4971dafae80c67507857806de Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 10:16:10 +0200
Subject: [PATCH 13/67] already checked in scrollToPostIfSelf

---
 public/src/client/topic/posts.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index dbe2eddf16..07212989f2 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -50,9 +50,7 @@ define('forum/topic/posts', [
 
 	function onNewPostPagination(data) {
 		function scrollToPost() {
-			if (config.scrollToMyPost) {
-				scrollToPostIfSelf(data.posts[0]);
-			}
+			scrollToPostIfSelf(data.posts[0]);
 		}
 
 		var posts = data.posts;

From cccc64ef90b56238e8913df61c6aa484090cc426 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 10:46:28 +0200
Subject: [PATCH 14/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bf83707c69..d165ffcb6f 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.99",
+    "nodebb-theme-persona": "4.0.100",
     "nodebb-theme-vanilla": "5.0.56",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 294171b07266706ac78850be8b85b3d27e332424 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 08:58:59 -0400
Subject: [PATCH 15/67] fixes potential XSS in usercard

---
 src/posts/user.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/posts/user.js b/src/posts/user.js
index 0d41397960..cd675cbfa3 100644
--- a/src/posts/user.js
+++ b/src/posts/user.js
@@ -1,6 +1,7 @@
 'use strict';
 
 var async = require('async'),
+	validator = require('validator'),
 
 	db = require('../database'),
 	user = require('../user'),
@@ -69,6 +70,8 @@ module.exports = function(Posts) {
 				userData.picture = userData.picture || '';
 				userData.status = user.getStatus(userData);
 				userData.groupTitle = results.groupTitles[i].groupTitle;
+				userData.signature = validator.escape(userData.signature || '');
+				userData.fullname = validator.escape(userData.fullname || '');
 			});
 
 			async.map(userData, function(userData, next) {

From 67646e2cda3fc6b7c85a2d1c7a08affb997cbb2d Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 09:10:48 -0400
Subject: [PATCH 16/67] 1.0.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d165ffcb6f..51d18a5557 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPL-3.0",
   "description": "NodeBB Forum",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",

From 86106971c4dd41a53167be8bc12869c599835e80 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 15:50:21 +0200
Subject: [PATCH 17/67] closes #4382

---
 src/middleware/middleware.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index 0248af04f4..d09270c3c9 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -259,7 +259,6 @@ middleware.busyCheck = function(req, res, next) {
 
 middleware.applyBlacklist = function(req, res, next) {
 	meta.blacklist.test(req.ip, function(err) {
-		console.log('blacklist returned:', err);
 		next(err);
 	});
 };

From 9cb2f9e05f10fee944c27b5da4775919780f0815 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 10:05:38 -0400
Subject: [PATCH 18/67] removed JS fake link #4407

---
 public/src/client/groups/list.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/public/src/client/groups/list.js b/public/src/client/groups/list.js
index 7d444bfd87..606a460dff 100644
--- a/public/src/client/groups/list.js
+++ b/public/src/client/groups/list.js
@@ -7,12 +7,6 @@ define('forum/groups/list', ['forum/infinitescroll'], function(infinitescroll) {
 	Groups.init = function() {
 		var groupsEl = $('#groups-list');
 
-		groupsEl.on('click', '.list-cover', function() {
-			var groupSlug = $(this).parents('[data-slug]').attr('data-slug');
-
-			ajaxify.go('groups/' + groupSlug);
-		});
-
 		infinitescroll.init(Groups.loadMoreGroups);
 
 		// Group creation

From 57ccbd606c73f63113d7273d724743ede50682bb Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 16:07:59 +0200
Subject: [PATCH 19/67] closes #4391

---
 src/user/create.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/user/create.js b/src/user/create.js
index 1d1543e863..ae69f1ad5d 100644
--- a/src/user/create.js
+++ b/src/user/create.js
@@ -1,14 +1,13 @@
 'use strict';
 
-var async = require('async'),
-	db = require('../database'),
-	utils = require('../../public/src/utils'),
-	validator = require('validator'),
-	plugins = require('../plugins'),
-	groups = require('../groups'),
-	meta = require('../meta'),
-	notifications = require('../notifications'),
-	translator = require('../../public/src/modules/translator');
+var async = require('async');
+var db = require('../database');
+var utils = require('../../public/src/utils');
+var validator = require('validator');
+var plugins = require('../plugins');
+var groups = require('../groups');
+var meta = require('../meta');
+
 
 module.exports = function(User) {
 
@@ -90,7 +89,11 @@ module.exports = function(User) {
 								db.sortedSetAdd('userslug:uid', userData.uid, userData.userslug, next);
 							},
 							function(next) {
-								db.sortedSetsAdd(['users:joindate', 'users:online', 'users:notvalidated'], timestamp, userData.uid, next);
+								var sets = ['users:joindate', 'users:online'];
+								if (parseInt(userData.uid) !== 1) {
+									sets.push('users:notvalidated');
+								}
+								db.sortedSetsAdd(sets, timestamp, userData.uid, next);
 							},
 							function(next) {
 								db.sortedSetsAdd(['users:postcount', 'users:reputation'], 0, userData.uid, next);
@@ -176,7 +179,7 @@ module.exports = function(User) {
 					next();
 				}
 			}
-		}, function(err, results) {
+		}, function(err) {
 			callback(err);
 		});
 	};

From 823880348cfb56b5e8b3af87bbb494821b859e17 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 10:10:07 -0400
Subject: [PATCH 20/67] up themes #4407

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 51d18a5557..71864fcb41 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.100",
-    "nodebb-theme-vanilla": "5.0.56",
+    "nodebb-theme-persona": "4.0.101",
+    "nodebb-theme-vanilla": "5.0.57",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",

From 041531a2e3a1fedb0e1189fee0f65239d4f760ae Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 16:48:07 +0200
Subject: [PATCH 21/67] closes #4424

---
 src/socket.io/groups.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js
index 8e35d74bca..a54db76b05 100644
--- a/src/socket.io/groups.js
+++ b/src/socket.io/groups.js
@@ -155,7 +155,7 @@ SocketGroups.kick = isOwner(function(socket, data, callback) {
 	if (socket.uid === parseInt(data.uid, 10)) {
 		return callback(new Error('[[error:cant-kick-self]]'));
 	}
-	
+
 	groups.ownership.isOwner(data.uid, data.groupName, function(err, isOwner) {
 		if (err) {
 			return callback(err);
@@ -178,16 +178,16 @@ SocketGroups.create = function(socket, data, callback) {
 };
 
 SocketGroups.delete = function(socket, data, callback) {
-	if (data.groupName === 'administrators' || data.groupName === 'registered-users') {
+	if (data.groupName === 'administrators' ||
+		data.groupName === 'registered-users' ||
+		data.groupName === 'Global Moderators') {
 		return callback(new Error('[[error:not-allowed]]'));
 	}
 
-	var tasks = {
+	async.parallel({
 		isOwner: async.apply(groups.ownership.isOwner, socket.uid, data.groupName),
 		isAdmin: async.apply(user.isAdministrator, socket.uid)
-	};
-
-	async.parallel(tasks, function(err, checks) {
+	}, function(err, checks) {
 		if (err) {
 			return callback(err);
 		}

From f665a1e353ffd9e89994ceaabcda60ef00999e27 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 17:49:44 +0200
Subject: [PATCH 22/67] closes #4394

---
 public/src/client/topic/postTools.js   |  1 -
 src/controllers/topics.js              |  2 +-
 src/routes/feeds.js                    |  2 +-
 src/social.js                          | 37 ++++++++++++++++++++++----
 src/socket.io/posts/tools.js           |  2 +-
 src/socket.io/topics/infinitescroll.js |  6 ++++-
 src/topics.js                          | 23 +++++++++-------
 src/topics/posts.js                    | 24 ++++++++---------
 8 files changed, 65 insertions(+), 32 deletions(-)

diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index 28701dd56a..101df3c646 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -34,7 +34,6 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 					return app.alertError(err);
 				}
 				data.posts.display_move_tools = data.posts.display_move_tools && index !== 0;
-				data.postSharing = data.postSharing.filter(function(share) { return share.activated === true; });
 
 				templates.parse('partials/topic/post-menu-list', data, function(html) {
 					translator.translate(html, function(html) {
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index 27c0ed5b81..cb30caf4d3 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -124,7 +124,7 @@ topicsController.get = function(req, res, callback) {
 				return callback();
 			}
 
-			topics.modifyPostsByPrivilege(topicData.posts, userPrivileges);
+			topics.modifyPostsByPrivilege(topicData, userPrivileges);
 
 			plugins.fireHook('filter:controllers.topic.get', {topicData: topicData, uid: req.uid}, next);
 		},
diff --git a/src/routes/feeds.js b/src/routes/feeds.js
index b71fc99aab..bfa2945fb5 100644
--- a/src/routes/feeds.js
+++ b/src/routes/feeds.js
@@ -49,7 +49,7 @@ function generateForTopic(req, res, callback) {
 			return callback(err);
 		}
 
-		topics.modifyPostsByPrivilege(topicData.posts, userPrivileges);
+		topics.modifyPostsByPrivilege(topicData, userPrivileges);
 
 		var description = topicData.posts.length ? topicData.posts[0].content : '';
 		var image_url = topicData.posts.length ? topicData.posts[0].picture : '';
diff --git a/src/social.js b/src/social.js
index c450421dcb..fec8fb036c 100644
--- a/src/social.js
+++ b/src/social.js
@@ -6,7 +6,13 @@ var async = require('async');
 
 var social = {};
 
+social.postSharing = null;
+
 social.getPostSharing = function(callback) {
+	if (social.postSharing) {
+		return callback(null, social.postSharing);
+	}
+
 	var networks = [
 		{
 			id: "facebook",
@@ -39,20 +45,41 @@ social.getPostSharing = function(callback) {
 					networks[i].activated = (activated.indexOf(network.id) !== -1);
 				});
 
+				social.postSharing = networks;
 				next(null, networks);
 			});
 		}
 	], callback);
 };
 
-social.setActivePostSharingNetworks = function(networkIDs, callback) {
-	db.delete('social:posts.activated', function(err) {
-		if (!networkIDs.length) {
+social.getActivePostSharing = function(callback) {
+	social.getPostSharing(function(err, networks) {
+		if (err) {
 			return callback(err);
 		}
-
-		db.setAdd('social:posts.activated', networkIDs, callback);
+		networks = networks.filter(function(network) {
+			return network && network.activated;
+		});
+		callback(null, networks);
 	});
 };
 
+social.setActivePostSharingNetworks = function(networkIDs, callback) {
+	async.waterfall([
+		function (next) {
+			db.delete('social:posts.activated', next);
+		},
+		function (next) {
+			if (!networkIDs.length) {
+				return next();
+			}
+			db.setAdd('social:posts.activated', networkIDs, next);
+		},
+		function (next) {
+			social.postSharing = null;
+			next();
+		}
+	], callback);
+};
+
 module.exports = social;
\ No newline at end of file
diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js
index c3f08461fe..5c59b28918 100644
--- a/src/socket.io/posts/tools.js
+++ b/src/socket.io/posts/tools.js
@@ -32,7 +32,7 @@ module.exports = function(SocketPosts) {
 				plugins.fireHook('filter:post.tools', {pid: data.pid, uid: socket.uid, tools: []}, next);
 			},
 			postSharing: function(next) {
-				social.getPostSharing(next);
+				social.getActivePostSharing(next);
 			}
 		}, function(err, results) {
 			if (err) {
diff --git a/src/socket.io/topics/infinitescroll.js b/src/socket.io/topics/infinitescroll.js
index 3ffe1c65c8..5c45c6e4fb 100644
--- a/src/socket.io/topics/infinitescroll.js
+++ b/src/socket.io/topics/infinitescroll.js
@@ -6,6 +6,7 @@ var topics = require('../../topics');
 var privileges = require('../../privileges');
 var meta = require('../../meta');
 var utils = require('../../../public/src/utils');
+var social = require('../../social');
 
 module.exports = function(SocketTopics) {
 
@@ -68,6 +69,9 @@ module.exports = function(SocketTopics) {
 				},
 				posts: function(next) {
 					topics.getTopicPosts(data.tid, set, start, stop, socket.uid, reverse, next);
+				},
+				postSharing: function (next) {
+					social.getActivePostSharing(next);
 				}
 			}, function(err, topicData) {
 				if (err) {
@@ -81,7 +85,7 @@ module.exports = function(SocketTopics) {
 				topicData['reputation:disabled'] = parseInt(meta.config['reputation:disabled'], 10) === 1;
 				topicData['downvote:disabled'] = parseInt(meta.config['downvote:disabled'], 10) === 1;
 
-				topics.modifyPostsByPrivilege(topicData.posts, results.privileges);
+				topics.modifyPostsByPrivilege(topicData, results.privileges);
 				callback(null, topicData);
 			});
 		});
diff --git a/src/topics.js b/src/topics.js
index 4f7f5a066d..ea9ac41830 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -1,15 +1,16 @@
 "use strict";
 
-var async = require('async'),
-	_ = require('underscore'),
+var async = require('async');
+var _ = require('underscore');
 
-	db = require('./database'),
-	posts = require('./posts'),
-	utils = require('../public/src/utils'),
-	plugins = require('./plugins'),
-	user = require('./user'),
-	categories = require('./categories'),
-	privileges = require('./privileges');
+var db = require('./database');
+var posts = require('./posts');
+var utils = require('../public/src/utils');
+var plugins = require('./plugins');
+var user = require('./user');
+var categories = require('./categories');
+var privileges = require('./privileges');
+var social = require('./social');
 
 (function(Topics) {
 
@@ -179,7 +180,8 @@ var async = require('async'),
 					threadTools: async.apply(plugins.fireHook, 'filter:topic.thread_tools', {topic: topicData, uid: uid, tools: []}),
 					tags: async.apply(Topics.getTopicTagsObjects, topicData.tid),
 					isFollowing: async.apply(Topics.isFollowing, [topicData.tid], uid),
-					bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid)
+					bookmark: async.apply(Topics.getUserBookmark, topicData.tid, uid),
+					postSharing: async.apply(social.getActivePostSharing)
 				}, next);
 			},
 			function (results, next) {
@@ -189,6 +191,7 @@ var async = require('async'),
 				topicData.tags = results.tags;
 				topicData.isFollowing = results.isFollowing[0];
 				topicData.bookmark = results.bookmark;
+				topicData.postSharing = results.postSharing;
 
 				topicData.unreplied = parseInt(topicData.postcount, 10) === 1;
 				topicData.deleted = parseInt(topicData.deleted, 10) === 1;
diff --git a/src/topics/posts.js b/src/topics/posts.js
index 8177e93ebd..0c9722f801 100644
--- a/src/topics/posts.js
+++ b/src/topics/posts.js
@@ -1,16 +1,15 @@
 
-
 'use strict';
 
-var async = require('async'),
-	_ = require('underscore'),
-	validator = require('validator'),
+var async = require('async');
+var _ = require('underscore');
+var validator = require('validator');
 
-	db = require('../database'),
-	user = require('../user'),
-	favourites = require('../favourites'),
-	posts = require('../posts'),
-	meta = require('../meta');
+var db = require('../database');
+var user = require('../user');
+var favourites = require('../favourites');
+var posts = require('../posts');
+var meta = require('../meta');
 
 module.exports = function(Topics) {
 
@@ -138,12 +137,13 @@ module.exports = function(Topics) {
 		});
 	};
 
-	Topics.modifyPostsByPrivilege = function(postData, topicPrivileges) {
-		postData.forEach(function(post) {
+	Topics.modifyPostsByPrivilege = function(topicData, topicPrivileges) {
+		var loggedIn = !!parseInt(topicPrivileges.uid, 10);
+		topicData.posts.forEach(function(post) {
 			if (post) {
 				post.display_moderator_tools = topicPrivileges.isAdminOrMod || post.selfPost;
 				post.display_move_tools = topicPrivileges.isAdminOrMod && post.index !== 0;
-				post.display_post_menu = topicPrivileges.isAdminOrMod || post.selfPost || !post.deleted;
+				post.display_post_menu = topicPrivileges.isAdminOrMod || post.selfPost || ((loggedIn || topicData.postSharing.length) && !post.deleted);
 				post.ip = topicPrivileges.isAdminOrMod ? post.ip : undefined;
 
 				if (post.deleted && !(topicPrivileges.isAdminOrMod || post.selfPost)) {

From 8075a2f00fcf50300ce912e6be1145e7489cf5d1 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 17:51:10 +0200
Subject: [PATCH 23/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 71864fcb41..8afd54ca9a 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.101",
+    "nodebb-theme-persona": "4.0.102",
     "nodebb-theme-vanilla": "5.0.57",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 301f12d630ba72c72c144581a038173da40672e2 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 17:55:15 +0200
Subject: [PATCH 24/67] fix conditional

---
 public/src/client/topic/posts.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index c83b8c245f..143a547744 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -26,7 +26,7 @@ define('forum/topic/posts', [
 			post.selfPost = !!app.user.uid && parseInt(post.uid, 10) === parseInt(app.user.uid, 10);
 			post.display_moderator_tools = post.selfPost || ajaxify.data.privileges.isAdminOrMod;
 			post.display_move_tools = ajaxify.data.privileges.isAdminOrMod;
-			post.display_post_menu = post.selfPost || ajaxify.data.privileges.isAdminOrMod || !post.deleted;
+			post.display_post_menu = ajaxify.data.privileges.isAdminOrMod || post.selfPost || ((app.user.uid || ajaxify.data.postSharing.length) && !post.deleted);
 		});
 
 		updatePostCounts(data.posts);

From cb8abab5c52bd347fc87e09500e036ec740e3977 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 18:13:36 +0200
Subject: [PATCH 25/67] fix for undefined topicTitle

---
 src/notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/notifications.js b/src/notifications.js
index f32ca031d3..8e90e0d62f 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -450,7 +450,7 @@ var async = require('async'),
 						});
 						var numUsers = usernames.length;
 
-						var title = S(notifications[modifyIndex].topicTitle).decodeHTMLEntities().s;
+						var title = S(notifications[modifyIndex].topicTitle || '').decodeHTMLEntities().s;
 						var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
 
 						if (numUsers === 2) {

From e3077b0ab0c83162130f59d91803002fdef25be6 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 18:18:59 +0200
Subject: [PATCH 26/67] dont use titleEscaped if its empty

---
 src/notifications.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/notifications.js b/src/notifications.js
index 8e90e0d62f..498337a7db 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -106,7 +106,7 @@ var async = require('async'),
 			});
 
 			callback(null, _nids.filter(function(nid, idx) {
-				return mergeIds.indexOf(sets[idx]) !== -1
+				return mergeIds.indexOf(sets[idx]) !== -1;
 			}));
 		});
 	};
@@ -452,11 +452,12 @@ var async = require('async'),
 
 						var title = S(notifications[modifyIndex].topicTitle || '').decodeHTMLEntities().s;
 						var titleEscaped = title.replace(/%/g, '&#37;').replace(/,/g, '&#44;');
+						titleEscaped = titleEscaped ? (', ' + titleEscaped) : '';
 
 						if (numUsers === 2) {
-							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + ', ' + titleEscaped + ']]';
+							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_dual, ' + usernames.join(', ') + titleEscaped + ']]';
 						} else if (numUsers > 2) {
-							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers-1) + ', ' + titleEscaped + ']]';
+							notifications[modifyIndex].bodyShort = '[[' + mergeId + '_multiple, ' + usernames[0] + ', ' + (numUsers - 1) + titleEscaped + ']]';
 						}
 						break;
 

From 35a7554ec7c312435fe9c2ba5a1461da4f76fe5a Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 21 Mar 2016 18:41:33 +0200
Subject: [PATCH 27/67] closes #4427

---
 src/topics/data.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/topics/data.js b/src/topics/data.js
index a32ce5256a..9d153b5b78 100644
--- a/src/topics/data.js
+++ b/src/topics/data.js
@@ -59,7 +59,7 @@ module.exports = function(Topics) {
 			return;
 		}
 		topic.titleRaw = topic.title;
-		topic.title = validator.escape(topic.title);
+		topic.title = validator.escape(String(topic.title));
 		topic.timestampISO = utils.toISOString(topic.timestamp);
 		topic.lastposttimeISO = utils.toISOString(topic.lastposttime);
 	}

From 3e14606226dc8cc3ea8ad769f544c19264dcf9ac Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 12:57:23 -0400
Subject: [PATCH 28/67] added roomId to match the other hook

---
 public/src/modules/chat.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index ea8fca978a..e860a0ff20 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -50,7 +50,8 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra
 
 					taskbar.push('chat', modal.attr('UUID'), {
 						title: username,
-						touid: data.message.fromUser.uid
+						touid: data.message.fromUser.uid,
+						roomId: data.roomId
 					});
 				}
 			} else {

From 489bdcced60c15ec92f238c01493523d7f747487 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 12:57:44 -0400
Subject: [PATCH 29/67] #4423

---
 public/src/modules/taskbar.js | 2 +-
 src/socket.io/modules.js      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/public/src/modules/taskbar.js b/public/src/modules/taskbar.js
index e664037c0d..7f5978250b 100644
--- a/public/src/modules/taskbar.js
+++ b/public/src/modules/taskbar.js
@@ -55,7 +55,7 @@ define('taskbar', function() {
 
 		$(window).trigger('filter:taskbar.push', data);
 
-		if (!element.length) {
+		if (!element.length && data.module) {
 			createTaskbar(data);
 		}
 	};
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index 16d48b5deb..ebd27730e4 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -240,6 +240,7 @@ SocketModules.chats.markRead = function(socket, roomId, callback) {
 			user.notifications.pushCount(socket.uid);
 		});
 
+		server.in('uid_' + socket.uid).emit('event:chats.markedAsRead', {roomId: roomId});
 		callback();
 	});
 };

From 963d13795bcd00b98312cd9557d9a09b9870f23b Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 13:00:11 -0400
Subject: [PATCH 30/67] bump persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8afd54ca9a..7aef5b5dbf 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.102",
+    "nodebb-theme-persona": "4.0.103",
     "nodebb-theme-vanilla": "5.0.57",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 7e827fd5e76d0eb1b806cf5b0232041f8cf3c17f Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 13:10:39 -0400
Subject: [PATCH 31/67] up themes #4413

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 7aef5b5dbf..3b4fd8d652 100644
--- a/package.json
+++ b/package.json
@@ -53,8 +53,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.103",
-    "nodebb-theme-vanilla": "5.0.57",
+    "nodebb-theme-persona": "4.0.104",
+    "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",
     "nodemailer-sendmail-transport": "1.0.0",

From a68811cad2eaed366c5237725610187586161838 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Mon, 21 Mar 2016 13:49:37 -0400
Subject: [PATCH 32/67] closes #4428

---
 src/controllers/groups.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index a67700c0d9..837ba3b1f6 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -113,7 +113,7 @@ groupsController.members = function(req, res, next) {
 			user.getUsersFromSet('group:' + groupName + ':members', req.uid, 0, 49, next);
 		},
 	], function(err, users) {
-		if (err) {
+		if (err || !groupName) {
 			return next(err);
 		}
 

From fd854b134deb51464900d96cb45aee381d1d0d18 Mon Sep 17 00:00:00 2001
From: RaceProUK <raceprouk@hotmail.co.uk>
Date: Mon, 21 Mar 2016 19:49:35 +0000
Subject: [PATCH 33/67] Allow for a little scrolling before dismissing bookmark
 alert

This is just in case someone scrolls a little accidentally; the alert remains so they can still follow it if they want to
---
 public/src/client/topic.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index c3e228f9ae..7a989f96aa 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -221,7 +221,9 @@ define('forum/topic', [
 		} else {
 			span.html('').hide();
 		}
-		app.removeAlert('bookmark');
+		if ($(window).scrollTop() > 300) {
+			app.removeAlert('bookmark');
+		}
 	}
 
 	Topic.calculateIndex = function(index, elementCount) {

From be4aa5ac948a4bdbe65c488cf88f135c89e57383 Mon Sep 17 00:00:00 2001
From: pichalite <pichalite.com@gmail.com>
Date: Mon, 21 Mar 2016 21:13:36 +0000
Subject: [PATCH 34/67] add title length check to topic fork process

---
 src/topics/fork.js | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/topics/fork.js b/src/topics/fork.js
index fa4633fdd6..948cb3207e 100644
--- a/src/topics/fork.js
+++ b/src/topics/fork.js
@@ -1,14 +1,14 @@
 
 'use strict';
 
-var async = require('async'),
-	winston = require('winston'),
-
-	db = require('../database'),
-	user = require('../user'),
-	posts = require('../posts'),
-	privileges = require('../privileges'),
-	plugins = require('../plugins');
+var async = require('async');
+var winston = require('winston');
+var db = require('../database');
+var user = require('../user');
+var posts = require('../posts');
+var privileges = require('../privileges');
+var plugins = require('../plugins');
+var meta = require('../meta');
 
 
 module.exports = function(Topics) {
@@ -18,8 +18,10 @@ module.exports = function(Topics) {
 			title = title.trim();
 		}
 
-		if (!title) {
-			return callback(new Error('[[error:invalid-title]]'));
+		if (title.length < parseInt(meta.config.minimumTitleLength, 10)) {
+			return callback(new Error('[[error:title-too-short, ' + meta.config.minimumTitleLength + ']]'));
+		} else if (title.length > parseInt(meta.config.maximumTitleLength, 10)) {
+			return callback(new Error('[[error:title-too-long, ' + meta.config.maximumTitleLength + ']]'));
 		}
 
 		if (!pids || !pids.length) {

From e0155534d53a81fa74b24830ab6f6f05f2c52717 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 09:41:49 +0200
Subject: [PATCH 35/67] up dbsearch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3b4fd8d652..b6542e1060 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
     "nodebb-plugin-composer-default": "3.0.11",
-    "nodebb-plugin-dbsearch": "1.0.0",
+    "nodebb-plugin-dbsearch": "1.0.1",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",
     "nodebb-plugin-mentions": "1.0.20",

From e694bd8ab595bc88509af68fea8a95aeb6887a5e Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 09:47:29 +0200
Subject: [PATCH 36/67] closes #4431

---
 src/controllers/tags.js      | 3 +++
 src/socket.io/topics/tags.js | 8 +++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/controllers/tags.js b/src/controllers/tags.js
index 60f4c1d028..af8f6058c0 100644
--- a/src/controllers/tags.js
+++ b/src/controllers/tags.js
@@ -65,6 +65,9 @@ tagsController.getTags = function(req, res, next) {
 		if (err) {
 			return next(err);
 		}
+		tags = tags.filter(function(tag) {
+			return tag && tag.score > 0;
+		});
 		var data = {
 			tags: tags,
 			nextStart: 100,
diff --git a/src/socket.io/topics/tags.js b/src/socket.io/topics/tags.js
index 535fdc3027..f55ec377fb 100644
--- a/src/socket.io/topics/tags.js
+++ b/src/socket.io/topics/tags.js
@@ -20,14 +20,16 @@ module.exports = function(SocketTopics) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 
-		var start = parseInt(data.after, 10),
-			stop = start + 99;
+		var start = parseInt(data.after, 10);
+		var stop = start + 99;
 
 		topics.getTags(start, stop, function(err, tags) {
 			if (err) {
 				return callback(err);
 			}
-
+			tags = tags.filter(function(tag) {
+				return tag && tag.score > 0;
+			});
 			callback(null, {tags: tags, nextStart: stop + 1});
 		});
 	};

From e0f3ac8cb718a49a7922591e346d95434463ed17 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 09:49:25 +0200
Subject: [PATCH 37/67] change to editedISO

---
 public/src/client/topic/events.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index d65a1c7c47..6c8f58b55b 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -124,7 +124,7 @@ define('forum/topic/events', [
 
 		var editData = {
 			editor: data.editor,
-			relativeEditTime: utils.toISOString(data.post.edited)
+			editedISO: utils.toISOString(data.post.edited)
 		};
 
 		templates.parse('partials/topic/post-editor', editData, function(html) {

From 6f7cc36c214132459bf639159f09297d17314e07 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 09:52:14 +0200
Subject: [PATCH 38/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b6542e1060..cc8b2727f0 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.104",
+    "nodebb-theme-persona": "4.0.105",
     "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From fd932462f6931be5a7489e81447cb8dce362859a Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 10:27:12 +0200
Subject: [PATCH 39/67] edit profile language key

---
 public/language/en_GB/user.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index d76e82b5b3..07c85aa19f 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -42,6 +42,7 @@
 	"change_username": "Change Username",
 	"change_email": "Change Email",
 	"edit": "Edit",
+	"edit-profile": "Edit Profile",
 	"default_picture": "Default Icon",
 	"uploaded_picture": "Uploaded Picture",
 	"upload_new_picture": "Upload New Picture",

From 6644c66f94a574b225f3d5290cbefb7bd2259a83 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 10:34:35 +0200
Subject: [PATCH 40/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cc8b2727f0..193425279b 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.5",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.105",
+    "nodebb-theme-persona": "4.0.106",
     "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From e2f78a958509a38c1381f582e6e187428a0ee3f2 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 11:19:33 +0200
Subject: [PATCH 41/67] closes #4432

---
 public/src/app.js                |  5 ++++-
 public/src/modules/translator.js | 13 +++++++------
 src/controllers/helpers.js       |  6 +++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 65276bc798..2d37b53a41 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -326,7 +326,10 @@ app.cacheBuster = null;
 			return;
 		}
 		require(['translator'], function(translator) {
-			title = config.titleLayout.replace(/&#123;/g, '{').replace(/&#125;/g, '}').replace('{pageTitle}', title).replace('{browserTitle}', config.browserTitle);
+			title = config.titleLayout.replace(/&#123;/g, '{').replace(/&#125;/g, '}')
+				.replace('{pageTitle}', function() { return title; })
+				.replace('{browserTitle}', function() { return config.browserTitle; });
+
 			translator.translate(title, function(translated) {
 				titleObj.titles[0] = translated;
 				app.alternatingTitle('');
diff --git a/public/src/modules/translator.js b/public/src/modules/translator.js
index 5892f6dde8..b208a0af48 100644
--- a/public/src/modules/translator.js
+++ b/public/src/modules/translator.js
@@ -213,13 +213,14 @@
 
 	function insertLanguage(text, key, value, variables) {
 		if (value) {
-			var variable;
-			for (var i = 1, ii = variables.length; i < ii; i++) {
-				variable = S(variables[i]).chompRight(']]').collapseWhitespace().decodeHTMLEntities().escapeHTML().s;
-				value = value.replace('%' + i, variable);
-			}
+			variables.forEach(function(variable, index) {
+				if (index > 0) {
+					variable = S(variable).chompRight(']]').collapseWhitespace().decodeHTMLEntities().escapeHTML().s;
+					value = value.replace('%' + index, function() { return variable; });
+				}
+			});
 
-			text = text.replace(key, value);
+			text = text.replace(key, function() { return value; });
 		} else {
 			var string = key.split(':');
 			text = text.replace(key, string[string.length-1].replace(regexes.replace, ''));
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
index 3962e2036b..058a1849b1 100644
--- a/src/controllers/helpers.js
+++ b/src/controllers/helpers.js
@@ -105,7 +105,11 @@ helpers.buildTitle = function(pageTitle) {
 
 	var browserTitle = validator.escape(meta.config.browserTitle || meta.config.title || 'NodeBB');
 	pageTitle = pageTitle || '';
-	var title = titleLayout.replace('{pageTitle}', pageTitle).replace('{browserTitle}', browserTitle);
+	var title = titleLayout.replace('{pageTitle}', function() {
+		return pageTitle;
+	}).replace('{browserTitle}', function() {
+		return browserTitle;
+	});
 	return title;
 };
 

From f246c5e1ee9f43f7e3a2ee8c4f550c91664a3f9f Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 11:39:28 +0200
Subject: [PATCH 42/67] closes
 https://github.com/NodeBB/nodebb-theme-persona/issues/259

---
 src/topics/posts.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/topics/posts.js b/src/topics/posts.js
index 0c9722f801..445eab4637 100644
--- a/src/topics/posts.js
+++ b/src/topics/posts.js
@@ -148,6 +148,9 @@ module.exports = function(Topics) {
 
 				if (post.deleted && !(topicPrivileges.isAdminOrMod || post.selfPost)) {
 					post.content = '[[topic:post_is_deleted]]';
+					if (post.user) {
+						post.user.signature = '';
+					}
 				}
 			}
 		});

From 7d96a1c130ac003f86e6e433a26ec3f27f93fec4 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 16:36:54 +0200
Subject: [PATCH 43/67] up spam-be-gone

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 193425279b..ff63f54864 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "nodebb-plugin-markdown": "4.0.17",
     "nodebb-plugin-mentions": "1.0.20",
     "nodebb-plugin-soundpack-default": "0.1.6",
-    "nodebb-plugin-spam-be-gone": "0.4.5",
+    "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
     "nodebb-theme-persona": "4.0.106",

From 7e6e3b3a4034687c01af5d8027753746c09fb421 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 16:47:30 +0200
Subject: [PATCH 44/67] closes #4383

---
 public/src/admin/manage/category.js |  6 ------
 src/controllers/admin/categories.js | 15 ++++++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/public/src/admin/manage/category.js b/public/src/admin/manage/category.js
index 26238f1101..c6da11cd88 100644
--- a/public/src/admin/manage/category.js
+++ b/public/src/admin/manage/category.js
@@ -155,12 +155,6 @@ define('admin/manage/category', [
 		} else {
 			$('a[href="#analytics"]').on('shown.bs.tab', Category.setupGraphs);
 		}
-
-		// Fix the input field for the category name, as it can contain a translation key
-		var nameInput = $('#cid-' + ajaxify.data.cid + '-name');
-		if (ajaxify.data.category.name !== nameInput.val()) {
-			$('#cid-' + ajaxify.data.category.cid + '-name').val(ajaxify.data.category.name);
-		}
 	};
 
 	Category.setupPrivilegeTable = function() {
diff --git a/src/controllers/admin/categories.js b/src/controllers/admin/categories.js
index 704dc21a2c..31bd44bd49 100644
--- a/src/controllers/admin/categories.js
+++ b/src/controllers/admin/categories.js
@@ -1,11 +1,12 @@
 "use strict";
 
-var async = require('async'),
-	
-	categories = require('../../categories'),
-	privileges = require('../../privileges'),
-	analytics = require('../../analytics'),
-	plugins = require('../../plugins');
+var async = require('async');
+
+var categories = require('../../categories');
+var privileges = require('../../privileges');
+var analytics = require('../../analytics');
+var plugins = require('../../plugins');
+var translator = require('../../../public/src/modules/translator')
 
 
 var categoriesController = {};
@@ -24,7 +25,7 @@ categoriesController.get = function(req, res, next) {
 			if (err) {
 				return next(err);
 			}
-
+			data.category.name = translator.escape(data.category.name);
 			res.render('admin/manage/category', {
 				category: data.category,
 				privileges: data.privileges,

From 7d31810df039ef3a77407d6f3d711a19ef877dc1 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Tue, 22 Mar 2016 11:09:32 -0400
Subject: [PATCH 45/67] up tjs

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ff63f54864..1f84f919dc 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "socket.io-redis": "^1.0.0",
     "socketio-wildcard": "~0.3.0",
     "string": "^3.0.0",
-    "templates.js": "0.3.3",
+    "templates.js": "0.3.4",
     "toobusy-js": "^0.4.2",
     "uglify-js": "^2.6.0",
     "underscore": "^1.8.3",

From 4460588e9541c8f3b873a41f8762b5f530ac7e36 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 17:19:14 +0200
Subject: [PATCH 46/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1f84f919dc..33e4d20c8a 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.106",
+    "nodebb-theme-persona": "4.0.107",
     "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 0bf05a17bff24d29953eb00af657b0b5735b7f88 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 18:22:42 +0200
Subject: [PATCH 47/67] closes #4378

---
 public/src/utils.js                           | 17 +++++++++++
 .../bootstrap-tagsinput.css                   | 22 +++++++++++---
 .../bootstrap-tagsinput.min.js                |  4 +--
 src/topics/tags.js                            | 29 ++++++-------------
 4 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/public/src/utils.js b/public/src/utils.js
index 2c821c1701..68de6a3506 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -92,6 +92,23 @@
 			return str;
 		},
 
+		cleanUpTag: function(tag, maxLength) {
+			if (typeof tag !== 'string' || !tag.length ) {
+				return '';
+			}
+
+			tag = tag.trim().toLowerCase();
+			// see https://github.com/NodeBB/NodeBB/issues/4378
+			tag = tag.replace(/\u202E/gi, '');
+			tag = tag.replace(/[,\/#!$%\^\*;:{}=_`<>'"~()?\|]/g, '');
+			tag = tag.substr(0, maxLength || 15).trim();
+			var matches = tag.match(/^[.-]*(.+?)[.-]*$/);
+			if (matches && matches.length > 1) {
+				tag = matches[1];
+			}
+			return tag;
+		},
+
 		removePunctuation: function(str) {
 			return str.replace(/[\.,-\/#!$%\^&\*;:{}=\-_`<>'"~()?]/g, '');
 		},
diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css
index 55f7c09df0..f08e955b17 100644
--- a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css
+++ b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.css
@@ -1,10 +1,14 @@
+/*
+ * bootstrap-tagsinput v0.8.0
+ *
+ */
+
 .bootstrap-tagsinput {
   background-color: #fff;
   border: 1px solid #ccc;
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   display: inline-block;
   padding: 4px 6px;
-  margin-bottom: 10px;
   color: #555;
   vertical-align: middle;
   border-radius: 4px;
@@ -17,11 +21,21 @@
   box-shadow: none;
   outline: none;
   background-color: transparent;
-  padding: 0;
+  padding: 0 6px;
   margin: 0;
-  width: auto !important;
+  width: auto;
   max-width: inherit;
 }
+.bootstrap-tagsinput.form-control input::-moz-placeholder {
+  color: #777;
+  opacity: 1;
+}
+.bootstrap-tagsinput.form-control input:-ms-input-placeholder {
+  color: #777;
+}
+.bootstrap-tagsinput.form-control input::-webkit-input-placeholder {
+  color: #777;
+}
 .bootstrap-tagsinput input:focus {
   border: none;
   box-shadow: none;
@@ -43,4 +57,4 @@
 }
 .bootstrap-tagsinput .tag [data-role="remove"]:hover:active {
   box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-}
+}
\ No newline at end of file
diff --git a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js
index 4cbe2ae178..49db4041a6 100644
--- a/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js
+++ b/public/vendor/jquery/bootstrap-tagsinput/bootstrap-tagsinput.min.js
@@ -1,6 +1,6 @@
 /*
- * bootstrap-tagsinput v0.7.1 by Tim Schlechter
+ * bootstrap-tagsinput v0.8.0
  *
  */
 
-!function(a){"use strict";function b(b,c){this.isInit=!0,this.itemsArray=[],this.$element=a(b),this.$element.hide(),this.isSelect="SELECT"===b.tagName,this.multiple=this.isSelect&&b.hasAttribute("multiple"),this.objectItems=c&&c.itemValue,this.placeholderText=b.hasAttribute("placeholder")?this.$element.attr("placeholder"):"",this.inputSize=Math.max(1,this.placeholderText.length),this.$container=a('<div class="bootstrap-tagsinput"></div>'),this.$input=a('<input type="text" placeholder="'+this.placeholderText+'"/>').appendTo(this.$container),this.$element.before(this.$container),this.build(c),this.isInit=!1}function c(a,b){if("function"!=typeof a[b]){var c=a[b];a[b]=function(a){return a[c]}}}function d(a,b){if("function"!=typeof a[b]){var c=a[b];a[b]=function(){return c}}}function e(a){return a?i.text(a).html():""}function f(a){var b=0;if(document.selection){a.focus();var c=document.selection.createRange();c.moveStart("character",-a.value.length),b=c.text.length}else(a.selectionStart||"0"==a.selectionStart)&&(b=a.selectionStart);return b}function g(b,c){var d=!1;return a.each(c,function(a,c){if("number"==typeof c&&b.which===c)return d=!0,!1;if(b.which===c.which){var e=!c.hasOwnProperty("altKey")||b.altKey===c.altKey,f=!c.hasOwnProperty("shiftKey")||b.shiftKey===c.shiftKey,g=!c.hasOwnProperty("ctrlKey")||b.ctrlKey===c.ctrlKey;if(e&&f&&g)return d=!0,!1}}),d}var h={tagClass:function(a){return"label label-info"},focusClass:"focus",itemValue:function(a){return a?a.toString():a},itemText:function(a){return this.itemValue(a)},itemTitle:function(a){return null},freeInput:!0,addOnBlur:!0,maxTags:void 0,maxChars:void 0,confirmKeys:[13,44],delimiter:",",delimiterRegex:null,cancelConfirmKeysOnEmpty:!1,onTagExists:function(a,b){b.hide().fadeIn()},trimValue:!1,allowDuplicates:!1};b.prototype={constructor:b,add:function(b,c,d){var f=this;if(!(f.options.maxTags&&f.itemsArray.length>=f.options.maxTags)&&(b===!1||b)){if("string"==typeof b&&f.options.trimValue&&(b=a.trim(b)),"object"==typeof b&&!f.objectItems)throw"Can't add objects when itemValue option is not set";if(!b.toString().match(/^\s*$/)){if(f.isSelect&&!f.multiple&&f.itemsArray.length>0&&f.remove(f.itemsArray[0]),"string"==typeof b&&"INPUT"===this.$element[0].tagName){var g=f.options.delimiterRegex?f.options.delimiterRegex:f.options.delimiter,h=b.split(g);if(h.length>1){for(var i=0;i<h.length;i++)this.add(h[i],!0);return void(c||f.pushVal())}}var j=f.options.itemValue(b),k=f.options.itemText(b),l=f.options.tagClass(b),m=f.options.itemTitle(b),n=a.grep(f.itemsArray,function(a){return f.options.itemValue(a)===j})[0];if(!n||f.options.allowDuplicates){if(!(f.items().toString().length+b.length+1>f.options.maxInputLength)){var o=a.Event("beforeItemAdd",{item:b,cancel:!1,options:d});if(f.$element.trigger(o),!o.cancel){f.itemsArray.push(b);var p=a('<span class="tag '+e(l)+(null!==m?'" title="'+m:"")+'">'+e(k)+'<span data-role="remove"></span></span>');p.data("item",b),f.findInputWrapper().before(p),p.after(" ");var q=a('option[value="'+encodeURIComponent(j)+'"]',f.$element).length||a('option[value="'+e(j)+'"]',f.$element).length;if(f.isSelect&&!q){var r=a("<option selected>"+e(k)+"</option>");r.data("item",b),r.attr("value",j),f.$element.append(r)}c||f.pushVal(),(f.options.maxTags===f.itemsArray.length||f.items().toString().length===f.options.maxInputLength)&&f.$container.addClass("bootstrap-tagsinput-max"),a(".typeahead, .twitter-typeahead",f.$container).length&&f.$input.typeahead("val",""),this.isInit?f.$element.trigger(a.Event("itemAddedOnInit",{item:b,options:d})):f.$element.trigger(a.Event("itemAdded",{item:b,options:d}))}}}else if(f.options.onTagExists){var s=a(".tag",f.$container).filter(function(){return a(this).data("item")===n});f.options.onTagExists(b,s)}}}},remove:function(b,c,d){var e=this;if(e.objectItems&&(b="object"==typeof b?a.grep(e.itemsArray,function(a){return e.options.itemValue(a)==e.options.itemValue(b)}):a.grep(e.itemsArray,function(a){return e.options.itemValue(a)==b}),b=b[b.length-1]),b){var f=a.Event("beforeItemRemove",{item:b,cancel:!1,options:d});if(e.$element.trigger(f),f.cancel)return;a(".tag",e.$container).filter(function(){return a(this).data("item")===b}).remove(),a("option",e.$element).filter(function(){return a(this).data("item")===b}).remove(),-1!==a.inArray(b,e.itemsArray)&&e.itemsArray.splice(a.inArray(b,e.itemsArray),1)}c||e.pushVal(),e.options.maxTags>e.itemsArray.length&&e.$container.removeClass("bootstrap-tagsinput-max"),e.$element.trigger(a.Event("itemRemoved",{item:b,options:d}))},removeAll:function(){var b=this;for(a(".tag",b.$container).remove(),a("option",b.$element).remove();b.itemsArray.length>0;)b.itemsArray.pop();b.pushVal()},refresh:function(){var b=this;a(".tag",b.$container).each(function(){var c=a(this),d=c.data("item"),f=b.options.itemValue(d),g=b.options.itemText(d),h=b.options.tagClass(d);if(c.attr("class",null),c.addClass("tag "+e(h)),c.contents().filter(function(){return 3==this.nodeType})[0].nodeValue=e(g),b.isSelect){var i=a("option",b.$element).filter(function(){return a(this).data("item")===d});i.attr("value",f)}})},items:function(){return this.itemsArray},pushVal:function(){var b=this,c=a.map(b.items(),function(a){return b.options.itemValue(a).toString()});b.$element.val(c,!0).trigger("change")},build:function(b){var e=this;if(e.options=a.extend({},h,b),e.objectItems&&(e.options.freeInput=!1),c(e.options,"itemValue"),c(e.options,"itemText"),d(e.options,"tagClass"),e.options.typeahead){var i=e.options.typeahead||{};d(i,"source"),e.$input.typeahead(a.extend({},i,{source:function(b,c){function d(a){for(var b=[],d=0;d<a.length;d++){var g=e.options.itemText(a[d]);f[g]=a[d],b.push(g)}c(b)}this.map={};var f=this.map,g=i.source(b);a.isFunction(g.success)?g.success(d):a.isFunction(g.then)?g.then(d):a.when(g).then(d)},updater:function(a){return e.add(this.map[a]),this.map[a]},matcher:function(a){return-1!==a.toLowerCase().indexOf(this.query.trim().toLowerCase())},sorter:function(a){return a.sort()},highlighter:function(a){var b=new RegExp("("+this.query+")","gi");return a.replace(b,"<strong>$1</strong>")}}))}if(e.options.typeaheadjs){var j=null,k={},l=e.options.typeaheadjs;a.isArray(l)?(j=l[0],k=l[1]):k=l,e.$input.typeahead(j,k).on("typeahead:selected",a.proxy(function(a,b){k.valueKey?e.add(b[k.valueKey]):e.add(b),e.$input.typeahead("val","")},e))}e.$container.on("click",a.proxy(function(a){e.$element.attr("disabled")||e.$input.removeAttr("disabled"),e.$input.focus()},e)),e.options.addOnBlur&&e.options.freeInput&&e.$input.on("focusout",a.proxy(function(b){0===a(".typeahead, .twitter-typeahead",e.$container).length&&(e.add(e.$input.val()),e.$input.val(""))},e)),e.$container.on({focusin:function(){e.$container.addClass(e.options.focusClass)},focusout:function(){e.$container.removeClass(e.options.focusClass)}}),e.$container.on("keydown","input",a.proxy(function(b){var c=a(b.target),d=e.findInputWrapper();if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");switch(b.which){case 8:if(0===f(c[0])){var g=d.prev();g.length&&e.remove(g.data("item"))}break;case 46:if(0===f(c[0])){var h=d.next();h.length&&e.remove(h.data("item"))}break;case 37:var i=d.prev();0===c.val().length&&i[0]&&(i.before(d),c.focus());break;case 39:var j=d.next();0===c.val().length&&j[0]&&(j.after(d),c.focus())}var k=c.val().length;Math.ceil(k/5);c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("keypress","input",a.proxy(function(b){var c=a(b.target);if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");var d=c.val(),f=e.options.maxChars&&d.length>=e.options.maxChars;e.options.freeInput&&(g(b,e.options.confirmKeys)||f)&&(0!==d.length&&(e.add(f?d.substr(0,e.options.maxChars):d),c.val("")),e.options.cancelConfirmKeysOnEmpty===!1&&b.preventDefault());var h=c.val().length;Math.ceil(h/5);c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("click","[data-role=remove]",a.proxy(function(b){e.$element.attr("disabled")||e.remove(a(b.target).closest(".tag").data("item"))},e)),e.options.itemValue===h.itemValue&&("INPUT"===e.$element[0].tagName?e.add(e.$element.val()):a("option",e.$element).each(function(){e.add(a(this).attr("value"),!0)}))},destroy:function(){var a=this;a.$container.off("keypress","input"),a.$container.off("click","[role=remove]"),a.$container.remove(),a.$element.removeData("tagsinput"),a.$element.show()},focus:function(){this.$input.focus()},input:function(){return this.$input},findInputWrapper:function(){for(var b=this.$input[0],c=this.$container[0];b&&b.parentNode!==c;)b=b.parentNode;return a(b)}},a.fn.tagsinput=function(c,d,e){var f=[];return this.each(function(){var g=a(this).data("tagsinput");if(g)if(c||d){if(void 0!==g[c]){if(3===g[c].length&&void 0!==e)var h=g[c](d,null,e);else var h=g[c](d);void 0!==h&&f.push(h)}}else f.push(g);else g=new b(this,c),a(this).data("tagsinput",g),f.push(g),"SELECT"===this.tagName&&a("option",a(this)).attr("selected","selected"),a(this).val(a(this).val())}),"string"==typeof c?f.length>1?f:f[0]:f},a.fn.tagsinput.Constructor=b;var i=a("<div />");a(function(){a("input[data-role=tagsinput], select[multiple][data-role=tagsinput]").tagsinput()})}(window.jQuery);
+!function(a){"use strict";function b(b,c){this.isInit=!0,this.itemsArray=[],this.$element=a(b),this.$element.hide(),this.isSelect="SELECT"===b.tagName,this.multiple=this.isSelect&&b.hasAttribute("multiple"),this.objectItems=c&&c.itemValue,this.placeholderText=b.hasAttribute("placeholder")?this.$element.attr("placeholder"):"",this.inputSize=Math.max(1,this.placeholderText.length),this.$container=a('<div class="bootstrap-tagsinput"></div>'),this.$input=a('<input type="text" placeholder="'+this.placeholderText+'"/>').appendTo(this.$container),this.$element.before(this.$container),this.build(c),this.isInit=!1}function c(a,b){if("function"!=typeof a[b]){var c=a[b];a[b]=function(a){return a[c]}}}function d(a,b){if("function"!=typeof a[b]){var c=a[b];a[b]=function(){return c}}}function e(a){return a?i.text(a).html():""}function f(a){var b=0;if(document.selection){a.focus();var c=document.selection.createRange();c.moveStart("character",-a.value.length),b=c.text.length}else(a.selectionStart||"0"==a.selectionStart)&&(b=a.selectionStart);return b}function g(b,c){var d=!1;return a.each(c,function(a,c){if("number"==typeof c&&b.which===c)return d=!0,!1;if(b.which===c.which){var e=!c.hasOwnProperty("altKey")||b.altKey===c.altKey,f=!c.hasOwnProperty("shiftKey")||b.shiftKey===c.shiftKey,g=!c.hasOwnProperty("ctrlKey")||b.ctrlKey===c.ctrlKey;if(e&&f&&g)return d=!0,!1}}),d}var h={tagClass:function(a){return"label label-info"},focusClass:"focus",itemValue:function(a){return a?a.toString():a},itemText:function(a){return this.itemValue(a)},itemTitle:function(a){return null},freeInput:!0,addOnBlur:!0,maxTags:void 0,maxChars:void 0,confirmKeys:[13,44],delimiter:",",delimiterRegex:null,cancelConfirmKeysOnEmpty:!1,onTagExists:function(a,b){b.hide().fadeIn()},trimValue:!1,allowDuplicates:!1,triggerChange:!0};b.prototype={constructor:b,add:function(b,c,d){var f=this;if(!(f.options.maxTags&&f.itemsArray.length>=f.options.maxTags)&&(b===!1||b)){if("string"==typeof b&&f.options.trimValue&&(b=a.trim(b)),"object"==typeof b&&!f.objectItems)throw"Can't add objects when itemValue option is not set";if(!b.toString().match(/^\s*$/)){if(f.isSelect&&!f.multiple&&f.itemsArray.length>0&&f.remove(f.itemsArray[0]),"string"==typeof b&&"INPUT"===this.$element[0].tagName){var g=f.options.delimiterRegex?f.options.delimiterRegex:f.options.delimiter,h=b.split(g);if(h.length>1){for(var i=0;i<h.length;i++)this.add(h[i],!0);return void(c||f.pushVal(f.options.triggerChange))}}var j=f.options.itemValue(b),k=f.options.itemText(b),l=f.options.tagClass(b),m=f.options.itemTitle(b),n=a.grep(f.itemsArray,function(a){return f.options.itemValue(a)===j})[0];if(!n||f.options.allowDuplicates){if(!(f.items().toString().length+b.length+1>f.options.maxInputLength)){var o=a.Event("beforeItemAdd",{item:b,cancel:!1,options:d});if(f.$element.trigger(o),!o.cancel){f.itemsArray.push(b);var p=a('<span class="tag '+e(l)+(null!==m?'" title="'+m:"")+'">'+e(k)+'<span data-role="remove"></span></span>');p.data("item",b),f.findInputWrapper().before(p),p.after(" ");var q=a('option[value="'+encodeURIComponent(j)+'"]',f.$element).length||a('option[value="'+e(j)+'"]',f.$element).length;if(f.isSelect&&!q){var r=a("<option selected>"+e(k)+"</option>");r.data("item",b),r.attr("value",j),f.$element.append(r)}c||f.pushVal(f.options.triggerChange),(f.options.maxTags===f.itemsArray.length||f.items().toString().length===f.options.maxInputLength)&&f.$container.addClass("bootstrap-tagsinput-max"),a(".typeahead, .twitter-typeahead",f.$container).length&&f.$input.typeahead("val",""),this.isInit?f.$element.trigger(a.Event("itemAddedOnInit",{item:b,options:d})):f.$element.trigger(a.Event("itemAdded",{item:b,options:d}))}}}else if(f.options.onTagExists){var s=a(".tag",f.$container).filter(function(){return a(this).data("item")===n});f.options.onTagExists(b,s)}}}},remove:function(b,c,d){var e=this;if(e.objectItems&&(b="object"==typeof b?a.grep(e.itemsArray,function(a){return e.options.itemValue(a)==e.options.itemValue(b)}):a.grep(e.itemsArray,function(a){return e.options.itemValue(a)==b}),b=b[b.length-1]),b){var f=a.Event("beforeItemRemove",{item:b,cancel:!1,options:d});if(e.$element.trigger(f),f.cancel)return;a(".tag",e.$container).filter(function(){return a(this).data("item")===b}).remove(),a("option",e.$element).filter(function(){return a(this).data("item")===b}).remove(),-1!==a.inArray(b,e.itemsArray)&&e.itemsArray.splice(a.inArray(b,e.itemsArray),1)}c||e.pushVal(e.options.triggerChange),e.options.maxTags>e.itemsArray.length&&e.$container.removeClass("bootstrap-tagsinput-max"),e.$element.trigger(a.Event("itemRemoved",{item:b,options:d}))},removeAll:function(){var b=this;for(a(".tag",b.$container).remove(),a("option",b.$element).remove();b.itemsArray.length>0;)b.itemsArray.pop();b.pushVal(b.options.triggerChange)},refresh:function(){var b=this;a(".tag",b.$container).each(function(){var c=a(this),d=c.data("item"),f=b.options.itemValue(d),g=b.options.itemText(d),h=b.options.tagClass(d);if(c.attr("class",null),c.addClass("tag "+e(h)),c.contents().filter(function(){return 3==this.nodeType})[0].nodeValue=e(g),b.isSelect){var i=a("option",b.$element).filter(function(){return a(this).data("item")===d});i.attr("value",f)}})},items:function(){return this.itemsArray},pushVal:function(){var b=this,c=a.map(b.items(),function(a){return b.options.itemValue(a).toString()});b.$element.val(c,!0),b.options.triggerChange&&b.$element.trigger("change")},build:function(b){var e=this;if(e.options=a.extend({},h,b),e.objectItems&&(e.options.freeInput=!1),c(e.options,"itemValue"),c(e.options,"itemText"),d(e.options,"tagClass"),e.options.typeahead){var i=e.options.typeahead||{};d(i,"source"),e.$input.typeahead(a.extend({},i,{source:function(b,c){function d(a){for(var b=[],d=0;d<a.length;d++){var g=e.options.itemText(a[d]);f[g]=a[d],b.push(g)}c(b)}this.map={};var f=this.map,g=i.source(b);a.isFunction(g.success)?g.success(d):a.isFunction(g.then)?g.then(d):a.when(g).then(d)},updater:function(a){return e.add(this.map[a]),this.map[a]},matcher:function(a){return-1!==a.toLowerCase().indexOf(this.query.trim().toLowerCase())},sorter:function(a){return a.sort()},highlighter:function(a){var b=new RegExp("("+this.query+")","gi");return a.replace(b,"<strong>$1</strong>")}}))}if(e.options.typeaheadjs){var j=null,k={},l=e.options.typeaheadjs;a.isArray(l)?(j=l[0],k=l[1]):k=l,e.$input.typeahead(j,k).on("typeahead:selected",a.proxy(function(a,b){k.valueKey?e.add(b[k.valueKey]):e.add(b),e.$input.typeahead("val","")},e))}e.$container.on("click",a.proxy(function(a){e.$element.attr("disabled")||e.$input.removeAttr("disabled"),e.$input.focus()},e)),e.options.addOnBlur&&e.options.freeInput&&e.$input.on("focusout",a.proxy(function(b){0===a(".typeahead, .twitter-typeahead",e.$container).length&&(e.add(e.$input.val()),e.$input.val(""))},e)),e.$container.on({focusin:function(){e.$container.addClass(e.options.focusClass)},focusout:function(){e.$container.removeClass(e.options.focusClass)}}),e.$container.on("keydown","input",a.proxy(function(b){var c=a(b.target),d=e.findInputWrapper();if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");switch(b.which){case 8:if(0===f(c[0])){var g=d.prev();g.length&&e.remove(g.data("item"))}break;case 46:if(0===f(c[0])){var h=d.next();h.length&&e.remove(h.data("item"))}break;case 37:var i=d.prev();0===c.val().length&&i[0]&&(i.before(d),c.focus());break;case 39:var j=d.next();0===c.val().length&&j[0]&&(j.after(d),c.focus())}var k=c.val().length;Math.ceil(k/5);c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("keypress","input",a.proxy(function(b){var c=a(b.target);if(e.$element.attr("disabled"))return void e.$input.attr("disabled","disabled");var d=c.val(),f=e.options.maxChars&&d.length>=e.options.maxChars;e.options.freeInput&&(g(b,e.options.confirmKeys)||f)&&(0!==d.length&&(e.add(f?d.substr(0,e.options.maxChars):d),c.val("")),e.options.cancelConfirmKeysOnEmpty===!1&&b.preventDefault());var h=c.val().length;Math.ceil(h/5);c.attr("size",Math.max(this.inputSize,c.val().length))},e)),e.$container.on("click","[data-role=remove]",a.proxy(function(b){e.$element.attr("disabled")||e.remove(a(b.target).closest(".tag").data("item"))},e)),e.options.itemValue===h.itemValue&&("INPUT"===e.$element[0].tagName?e.add(e.$element.val()):a("option",e.$element).each(function(){e.add(a(this).attr("value"),!0)}))},destroy:function(){var a=this;a.$container.off("keypress","input"),a.$container.off("click","[role=remove]"),a.$container.remove(),a.$element.removeData("tagsinput"),a.$element.show()},focus:function(){this.$input.focus()},input:function(){return this.$input},findInputWrapper:function(){for(var b=this.$input[0],c=this.$container[0];b&&b.parentNode!==c;)b=b.parentNode;return a(b)}},a.fn.tagsinput=function(c,d,e){var f=[];return this.each(function(){var g=a(this).data("tagsinput");if(g)if(c||d){if(void 0!==g[c]){if(3===g[c].length&&void 0!==e)var h=g[c](d,null,e);else var h=g[c](d);void 0!==h&&f.push(h)}}else f.push(g);else g=new b(this,c),a(this).data("tagsinput",g),f.push(g),"SELECT"===this.tagName&&a("option",a(this)).attr("selected","selected"),a(this).val(a(this).val())}),"string"==typeof c?f.length>1?f:f[0]:f},a.fn.tagsinput.Constructor=b;var i=a("<div />");a(function(){a("input[data-role=tagsinput], select[multiple][data-role=tagsinput]").tagsinput()})}(window.jQuery);
diff --git a/src/topics/tags.js b/src/topics/tags.js
index 1b47a5d0e6..83702331b7 100644
--- a/src/topics/tags.js
+++ b/src/topics/tags.js
@@ -1,12 +1,13 @@
 
 'use strict';
 
-var async = require('async'),
+var async = require('async');
 
-	db = require('../database'),
-	meta = require('../meta'),
-	_ = require('underscore'),
-	plugins = require('../plugins');
+var db = require('../database');
+var meta = require('../meta');
+var _ = require('underscore');
+var plugins = require('../plugins');
+var utils = require('../../public/src/utils');
 
 
 module.exports = function(Topics) {
@@ -24,7 +25,9 @@ module.exports = function(Topics) {
 			},
 			function (data, next) {
 				tags = data.tags.slice(0, meta.config.maximumTagsPerTopic || 5);
-				tags = tags.map(Topics.cleanUpTag).filter(function(tag, index, array) {
+				tags = tags.map(function(tag) {
+					return utils.cleanUpTag(tag, meta.config.maximumTagLength);
+				}).filter(function(tag, index, array) {
 					return tag && tag.length >= (meta.config.minimumTagLength || 3) && array.indexOf(tag) === index;
 				});
 
@@ -45,20 +48,6 @@ module.exports = function(Topics) {
 		], callback);
 	};
 
-	Topics.cleanUpTag = function(tag) {
-		if (typeof tag !== 'string' || !tag.length ) {
-			return '';
-		}
-		tag = tag.trim().toLowerCase();
-		tag = tag.replace(/[,\/#!$%\^\*;:{}=_`<>'"~()?\|]/g, '');
-		tag = tag.substr(0, meta.config.maximumTagLength || 15).trim();
-		var matches = tag.match(/^[.-]*(.+?)[.-]*$/);
-		if (matches && matches.length > 1) {
-			tag = matches[1];
-		}
-		return tag;
-	};
-
 	Topics.updateTag = function(tag, data, callback) {
 		db.setObject('tag:' + tag, data, callback);
 	};

From e4fb4c04691f541bc5971ca8a56a30cad44e4364 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 18:24:29 +0200
Subject: [PATCH 48/67] up composer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 33e4d20c8a..d442a1d33c 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.11",
+    "nodebb-plugin-composer-default": "3.0.12",
     "nodebb-plugin-dbsearch": "1.0.1",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",

From f4dd3d2082f690ddfc926f2b19fedc79a959a6dd Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 18:32:25 +0200
Subject: [PATCH 49/67] up users per page to 50

---
 src/controllers/admin/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js
index 3651767153..b711998e1a 100644
--- a/src/controllers/admin/users.js
+++ b/src/controllers/admin/users.js
@@ -124,7 +124,7 @@ usersController.registrationQueue = function(req, res, next) {
 
 function getUsers(set, section, req, res, next) {
 	var page = parseInt(req.query.page, 10) || 1;
-	var resultsPerPage = 25;
+	var resultsPerPage = 50;
 	var start = Math.max(0, page - 1) * resultsPerPage;
 	var stop = start + resultsPerPage - 1;
 

From 9b1dab8ef9bb95f1d2c95c446a9ecefe7f680a29 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 18:33:35 +0200
Subject: [PATCH 50/67] up default to 50

---
 src/controllers/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/users.js b/src/controllers/users.js
index 1eb5989c1c..31ac0bd1cc 100644
--- a/src/controllers/users.js
+++ b/src/controllers/users.js
@@ -103,7 +103,7 @@ usersController.getUsers = function(set, uid, page, callback) {
 	}
 
 	page = parseInt(page, 10) || 1;
-	var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 20;
+	var resultsPerPage = parseInt(meta.config.userSearchResultsPerPage, 10) || 50;
 	var start = Math.max(0, page - 1) * resultsPerPage;
 	var stop = start + resultsPerPage - 1;
 

From 931dedf7f1808effd3915a200a5e6576fb2b3d83 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Tue, 22 Mar 2016 18:41:18 +0200
Subject: [PATCH 51/67] revert 50 change on admin

---
 src/controllers/admin/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/controllers/admin/users.js b/src/controllers/admin/users.js
index b711998e1a..3651767153 100644
--- a/src/controllers/admin/users.js
+++ b/src/controllers/admin/users.js
@@ -124,7 +124,7 @@ usersController.registrationQueue = function(req, res, next) {
 
 function getUsers(set, section, req, res, next) {
 	var page = parseInt(req.query.page, 10) || 1;
-	var resultsPerPage = 50;
+	var resultsPerPage = 25;
 	var start = Math.max(0, page - 1) * resultsPerPage;
 	var stop = start + resultsPerPage - 1;
 

From 89aa06526dd8b06e8c0268aca00571364118b97c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 00:05:07 +0200
Subject: [PATCH 52/67] fix indent

---
 src/privileges/topics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/privileges/topics.js b/src/privileges/topics.js
index 6cc66483e1..83e635fde9 100644
--- a/src/privileges/topics.js
+++ b/src/privileges/topics.js
@@ -37,7 +37,7 @@ module.exports = function(privileges) {
 
 			var disabled = parseInt(results.disabled, 10) === 1;
 			var locked = parseInt(topic.locked, 10) === 1;
-			var	isAdminOrMod = results.isAdministrator || results.isModerator;
+			var isAdminOrMod = results.isAdministrator || results.isModerator;
 			var editable = isAdminOrMod;
 			var deletable = isAdminOrMod || results.isOwner;
 

From 969e7fdbbe339315ba3487b28f880f401a9020e8 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 22 Mar 2016 18:40:42 -0500
Subject: [PATCH 53/67] include bookmarks with topic lists

---
 src/topics.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/topics.js b/src/topics.js
index ea9ac41830..4fe894145b 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -131,6 +131,14 @@ var social = require('./social');
 					hasRead: function(next) {
 						Topics.hasReadTopics(tids, uid, next);
 					},
+					bookmarks: function(next) {
+						if (!parseInt(uid, 10)) {
+							return next(null, tids.map(function() {
+								return null;
+							}));
+						}
+						Topics.getUserBookmarks(tids, uid, next);
+					},
 					teasers: function(next) {
 						Topics.getTeasers(topics, next);
 					},
@@ -155,6 +163,7 @@ var social = require('./social');
 						topics[i].locked = parseInt(topics[i].locked, 10) === 1;
 						topics[i].deleted = parseInt(topics[i].deleted, 10) === 1;
 						topics[i].unread = !results.hasRead[i];
+						topics[i].bookmark = results.bookmarks[i];
 						topics[i].unreplied = !topics[i].teaser;
 					}
 				}
@@ -292,6 +301,12 @@ var social = require('./social');
 		db.sortedSetScore('tid:' + tid + ':bookmarks', uid, callback);
 	};
 
+	Topics.getUserBookmarks = function(tids, uid, callback) {
+		db.sortedSetsScore(tids.map(function(tid) {
+			return 'tid:' + tid + ':bookmarks';
+		}), uid, callback);
+	};
+
 	Topics.setUserBookmark = function(tid, uid, index, callback) {
 		db.sortedSetAdd('tid:' + tid + ':bookmarks', index, uid, callback);
 	};

From 1d9ff2bc7016d16e1f91d390bb7e4a620d5d96dc Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 22 Mar 2016 19:51:31 -0500
Subject: [PATCH 54/67] save slug correctly on edit

---
 src/posts/edit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/posts/edit.js b/src/posts/edit.js
index d4c3a3c732..fece8aa640 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -118,7 +118,7 @@ module.exports = function(Posts) {
 
 			if (title) {
 				topicData.title = title;
-				topicData.slug = tid + '/' + utils.slugify(title);
+				topicData.slug = tid + '/' + (utils.slugify(title) || 'topic');
 			}
 
 			if (data.topic_thumb) {

From c7cfe45d0b408a2991efd3bbd05b845e964cc345 Mon Sep 17 00:00:00 2001
From: Ben Lubar <ben.lubar@gmail.com>
Date: Tue, 22 Mar 2016 19:54:27 -0500
Subject: [PATCH 55/67] fix double-URL-encoding causing redirect loops

---
 src/controllers/category.js | 2 +-
 src/controllers/topics.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/controllers/category.js b/src/controllers/category.js
index e3adde496f..f80ad122a7 100644
--- a/src/controllers/category.js
+++ b/src/controllers/category.js
@@ -52,7 +52,7 @@ categoryController.get = function(req, res, callback) {
 			}
 
 			if (!res.locals.isAPI && (!req.params.slug || results.categoryData.slug !== cid + '/' + req.params.slug) && (results.categoryData.slug && results.categoryData.slug !== cid + '/')) {
-				return helpers.redirect(res, '/category/' + encodeURI(results.categoryData.slug));
+				return helpers.redirect(res, '/category/' + results.categoryData.slug);
 			}
 
 			var settings = results.userSettings;
diff --git a/src/controllers/topics.js b/src/controllers/topics.js
index cb30caf4d3..c3c2847778 100644
--- a/src/controllers/topics.js
+++ b/src/controllers/topics.js
@@ -55,7 +55,7 @@ topicsController.get = function(req, res, callback) {
 			}
 
 			if (!res.locals.isAPI && (!req.params.slug || results.topic.slug !== tid + '/' + req.params.slug) && (results.topic.slug && results.topic.slug !== tid + '/')) {
-				var url = '/topic/' + encodeURI(results.topic.slug);
+				var url = '/topic/' + results.topic.slug;
 				if (req.params.post_index){
 					url += '/'+req.params.post_index;
 				}

From d79b30ad274c73414974baab5157db58430483fd Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 10:01:40 +0200
Subject: [PATCH 56/67] moved uid check to function

---
 src/topics.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/topics.js b/src/topics.js
index 4fe894145b..1541bd3fbb 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -132,11 +132,6 @@ var social = require('./social');
 						Topics.hasReadTopics(tids, uid, next);
 					},
 					bookmarks: function(next) {
-						if (!parseInt(uid, 10)) {
-							return next(null, tids.map(function() {
-								return null;
-							}));
-						}
 						Topics.getUserBookmarks(tids, uid, next);
 					},
 					teasers: function(next) {
@@ -302,6 +297,11 @@ var social = require('./social');
 	};
 
 	Topics.getUserBookmarks = function(tids, uid, callback) {
+		if (!parseInt(uid, 10)) {
+			return callback(null, tids.map(function() {
+				return null;
+			}));
+		}
 		db.sortedSetsScore(tids.map(function(tid) {
 			return 'tid:' + tid + ':bookmarks';
 		}), uid, callback);

From bfd6d1c0d16e57aba13c8b28b31245174c36425d Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 10:04:31 +0200
Subject: [PATCH 57/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d442a1d33c..bc264797c3 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.107",
+    "nodebb-theme-persona": "4.0.108",
     "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 56ef1e9869a4a9fb316d3d22bf617eb28d944b3b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 10:10:24 +0200
Subject: [PATCH 58/67] closes #4444

---
 public/src/modules/navigator.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/src/modules/navigator.js b/public/src/modules/navigator.js
index b17db23a14..3ac5fc16e2 100644
--- a/public/src/modules/navigator.js
+++ b/public/src/modules/navigator.js
@@ -225,7 +225,7 @@ define('navigator', ['forum/pagination', 'components'], function(pagination, com
 				scrollTo.parents('[component="post"]').addClass('highlight');
 				setTimeout(function() {
 					scrollTo.parents('[component="post"]').removeClass('highlight');
-				}, 3000);
+				}, 10000);
 			}
 		}
 

From 46de2ca134f00615bbbdb59cf5052fa00276f458 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 10:21:57 +0200
Subject: [PATCH 59/67] closes #4441

---
 src/topics/teaser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/topics/teaser.js b/src/topics/teaser.js
index c772b271d4..5d730de74d 100644
--- a/src/topics/teaser.js
+++ b/src/topics/teaser.js
@@ -74,7 +74,7 @@ module.exports = function(Topics) {
 						tidToPost[topic.tid].index = meta.config.teaserPost === 'first' ? 1 : counts[index];
 						if (tidToPost[topic.tid].content) {
 							var s = S(tidToPost[topic.tid].content);
-							tidToPost[topic.tid].content = s.stripTags.apply(s, utils.stripTags).s;
+							tidToPost[topic.tid].content = s.stripTags.apply(s, utils.stripTags.concat(['img'])).s;
 						}
 					}
 					return tidToPost[topic.tid];

From 91efab3c6d25e21a0f7a0a3a0efc6a6be0740e3c Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 11:17:17 +0200
Subject: [PATCH 60/67] closes #4437

---
 src/meta/templates.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/meta/templates.js b/src/meta/templates.js
index 04d9d31009..88578b235e 100644
--- a/src/meta/templates.js
+++ b/src/meta/templates.js
@@ -21,10 +21,10 @@ Templates.compile = function(callback) {
 
 	if (nconf.get('isPrimary') === 'false' || fromFile.match('tpl')) {
 		if (fromFile.match('tpl')) {
+			emitter.emit('templates:compiled');
 			winston.info('[minifier] Compiling templates skipped');
 		}
 
-		emitter.emit('templates:compiled');
 		return callback();
 	}
 
@@ -48,20 +48,28 @@ function getBaseTemplates(theme) {
 }
 
 function preparePaths(baseTemplatesPaths, callback) {
-	var coreTemplatesPath = nconf.get('core_templates_path'),
-		viewsPath = nconf.get('views_dir');
+	var coreTemplatesPath = nconf.get('core_templates_path');
+	var viewsPath = nconf.get('views_dir');
 
 	async.waterfall([
-		async.apply(plugins.fireHook, 'static:templates.precompile', {}),
-		async.apply(plugins.getTemplates)
+		function (next) {
+			rimraf(viewsPath, next);
+		},
+		function (next) {
+			mkdirp(viewsPath, next);
+		},
+		function(viewsPath, next) {
+			plugins.fireHook('static:templates.precompile', {}, next);
+		},
+		function(next) {
+			plugins.getTemplates(next);
+		}
 	], function(err, pluginTemplates) {
 		if (err) {
 			return callback(err);
 		}
 
 		winston.verbose('[meta/templates] Compiling templates');
-		rimraf.sync(viewsPath);
-		mkdirp.sync(viewsPath);
 
 		async.parallel({
 			coreTpls: function(next) {
@@ -111,7 +119,7 @@ function compile(callback) {
 	var themeConfig = require(nconf.get('theme_config')),
 		baseTemplatesPaths = themeConfig.baseTheme ? getBaseTemplates(themeConfig.baseTheme) : [nconf.get('base_templates_path')],
 		viewsPath = nconf.get('views_dir');
-	
+
 
 	preparePaths(baseTemplatesPaths, function(err, paths) {
 		if (err) {

From 7ab55b0e95cbb69eb0e2175319670a2f4e7a7342 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 12:19:29 +0200
Subject: [PATCH 61/67] closes #4392

---
 src/controllers/uploads.js | 79 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 8dff27b47c..59253c5666 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -45,11 +45,26 @@ uploadsController.upload = function(req, res, filesIterator, next) {
 
 uploadsController.uploadPost = function(req, res, next) {
 	uploadsController.upload(req, res, function(uploadedFile, next) {
-		if (uploadedFile.type.match(/image./)) {
-			uploadImage(req.uid, uploadedFile, next);
-		} else {
-			uploadFile(req.uid, uploadedFile, next);
+		var isImage = uploadedFile.type.match(/image./);
+		if (isImage && plugins.hasListeners('filter:uploadImage')) {
+			return plugins.fireHook('filter:uploadImage', {image: uploadedFile, uid: req.uid}, next);
 		}
+
+		async.waterfall([
+			function(next) {
+				if (isImage) {
+					file.isFileTypeAllowed(uploadedFile.path, next);
+				} else {
+					next();
+				}
+			},
+			function (next) {
+				if (parseInt(meta.config.allowFileUploads, 10) !== 1) {
+					return next(new Error('[[error:uploads-are-disabled]]'));
+				}
+				uploadFile(req.uid, uploadedFile, next);
+			}
+		], next);
 	}, next);
 };
 
@@ -65,22 +80,27 @@ uploadsController.uploadThumb = function(req, res, next) {
 				return next(err);
 			}
 
-			if (uploadedFile.type.match(/image./)) {
-				var size = parseInt(meta.config.topicThumbSize, 10) || 120;
-				image.resizeImage({
-					path: uploadedFile.path,
-					extension: path.extname(uploadedFile.name),
-					width: size,
-					height: size
-				}, function(err) {
-					if (err) {
-						return next(err);
-					}
-					uploadImage(req.uid, uploadedFile, next);
-				});
-			} else {
-				next(new Error('[[error:invalid-file]]'));
+			if (!uploadedFile.type.match(/image./)) {
+				return next(new Error('[[error:invalid-file]]'));
 			}
+
+			var size = parseInt(meta.config.topicThumbSize, 10) || 120;
+			image.resizeImage({
+				path: uploadedFile.path,
+				extension: path.extname(uploadedFile.name),
+				width: size,
+				height: size
+			}, function(err) {
+				if (err) {
+					return next(err);
+				}
+
+				if (plugins.hasListeners('filter:uploadImage')) {
+					return plugins.fireHook('filter:uploadImage', {image: uploadedFile, uid: req.uid}, next);
+				}
+
+				uploadFile(req.uid, uploadedFile, next);
+			});
 		});
 	}, next);
 };
@@ -102,32 +122,11 @@ uploadsController.uploadGroupCover = function(uid, uploadedFile, callback) {
 	});
 };
 
-function uploadImage(uid, image, callback) {
-	if (plugins.hasListeners('filter:uploadImage')) {
-		return plugins.fireHook('filter:uploadImage', {image: image, uid: uid}, callback);
-	}
-
-	file.isFileTypeAllowed(image.path, function(err) {
-		if (err) {
-			return callback(err);
-		}
-		if (parseInt(meta.config.allowFileUploads, 10)) {
-			uploadFile(uid, image, callback);
-		} else {
-			callback(new Error('[[error:uploads-are-disabled]]'));
-		}
-	});
-}
-
 function uploadFile(uid, uploadedFile, callback) {
 	if (plugins.hasListeners('filter:uploadFile')) {
 		return plugins.fireHook('filter:uploadFile', {file: uploadedFile, uid: uid}, callback);
 	}
 
-	if (parseInt(meta.config.allowFileUploads, 10) !== 1) {
-		return callback(new Error('[[error:uploads-are-disabled]]'));
-	}
-
 	if (!uploadedFile) {
 		return callback(new Error('[[error:invalid-file]]'));
 	}

From 71cd6b39d2926e844f81aa260bd82b54a0a39e52 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 12:21:38 +0200
Subject: [PATCH 62/67] up composer

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bc264797c3..dad104ab05 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.12",
+    "nodebb-plugin-composer-default": "3.0.13",
     "nodebb-plugin-dbsearch": "1.0.1",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",

From 5d77e37a3c21fa16b6f6ba29a789c59389d63b7d Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 23 Mar 2016 09:14:35 -0400
Subject: [PATCH 63/67] closes #4403

---
 public/src/client/topic/postTools.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/public/src/client/topic/postTools.js b/public/src/client/topic/postTools.js
index 101df3c646..b16a05a067 100644
--- a/public/src/client/topic/postTools.js
+++ b/public/src/client/topic/postTools.js
@@ -64,17 +64,21 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
 	};
 
 	function addVoteHandler() {
-		components.get('topic').on('mouseenter', '[data-pid] [component="post/vote-count"]', function() {
-			loadDataAndCreateTooltip($(this).parent());
-		});
+		components.get('topic').on('mouseenter', '[data-pid] [component="post/vote-count"]', loadDataAndCreateTooltip);
 	}
 
-	function loadDataAndCreateTooltip(el) {
-		var pid = el.parents('[data-pid]').attr('data-pid');
+	function loadDataAndCreateTooltip() {
+		var $this = $(this),
+			el = $this.parent(),
+			pid = el.parents('[data-pid]').attr('data-pid');
+
+		$this.off('mouseenter', loadDataAndCreateTooltip);
 		socket.emit('posts.getUpvoters', [pid], function(err, data) {
 			if (!err && data.length) {
 				createTooltip(el, data[0]);
 			}
+
+			$this.on('mouseenter', loadDataAndCreateTooltip);
 		});
 	}
 

From 09415d435a0c2aede74f445a5c592dc6ca243bd9 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 18:29:46 +0200
Subject: [PATCH 64/67] up persona

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dad104ab05..543d01efff 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.108",
+    "nodebb-theme-persona": "4.0.109",
     "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 493816476e7dfacab9aff1a754df16bc840a563f Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 23 Mar 2016 12:48:46 -0400
Subject: [PATCH 65/67] closes
 https://github.com/NodeBB/nodebb-theme-persona/issues/262

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 543d01efff..23d231eea4 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "mongodb": "~2.1.3",
     "morgan": "^1.3.2",
     "nconf": "~0.8.2",
-    "nodebb-plugin-composer-default": "3.0.13",
+    "nodebb-plugin-composer-default": "3.0.14",
     "nodebb-plugin-dbsearch": "1.0.1",
     "nodebb-plugin-emoji-extended": "1.0.3",
     "nodebb-plugin-markdown": "4.0.17",
@@ -53,7 +53,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.6",
     "nodebb-rewards-essentials": "0.0.8",
     "nodebb-theme-lavender": "3.0.9",
-    "nodebb-theme-persona": "4.0.109",
+    "nodebb-theme-persona": "4.0.110",
     "nodebb-theme-vanilla": "5.0.58",
     "nodebb-widget-essentials": "2.0.8",
     "nodemailer": "2.0.0",

From 0c1376c884fd3eee181ce9bcafe910b7a0dfee30 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 23 Mar 2016 13:08:15 -0400
Subject: [PATCH 66/67] closes #4390

---
 install/data/navigation.json           | 4 +---
 public/src/modules/helpers.js          | 2 +-
 src/views/admin/general/navigation.tpl | 9 +++++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/install/data/navigation.json b/install/data/navigation.json
index 5956c6b05f..0ec72805de 100644
--- a/install/data/navigation.json
+++ b/install/data/navigation.json
@@ -79,9 +79,7 @@
 		"textClass": "visible-xs-inline",
 		"text": "\\[\\[global:header.search\\]\\]",
 		"properties": {
-			"installed": {
-				"search": true
-			}
+			"searchInstalled": true
 		}
 	}
 ]
\ No newline at end of file
diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js
index 8d6b213a1d..dd15d0dab6 100644
--- a/public/src/modules/helpers.js
+++ b/public/src/modules/helpers.js
@@ -20,7 +20,7 @@
 			if ((properties.loggedIn && !data.config.loggedIn) ||
 				(properties.globalMod && !data.isGlobalMod && !data.isAdmin) ||
 				(properties.adminOnly && !data.isAdmin) ||
-				(properties.installed && properties.installed.search && !data.searchEnabled)) {
+				(properties.searchInstalled && !data.searchEnabled)) {
 				return false;
 			}
 		}
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index 116a0fd0f5..c36f08a693 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -84,6 +84,15 @@
 						</label>
 					</div>
 
+					<strong>Installed Plugins Required:</strong>
+
+					<div class="checkbox">
+						<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+							<input class="mdl-switch__input" type="checkbox" name="property:searchInstalled" <!-- IF enabled.properties.searchInstalled -->checked<!-- ENDIF enabled.properties.searchInstalled -->/>
+							<span class="mdl-switch__label"><strong>Search plugin</strong></span>
+						</label>
+					</div>
+
 					<button class="btn btn-danger delete">Delete</button>
 					<!-- IF enabled.enabled -->
 					<button class="btn btn-warning toggle">Disable</button>

From f55b26282a731e04b58034350303e4773d2d0c9a Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 23 Mar 2016 19:24:02 +0200
Subject: [PATCH 67/67] added category image

---
 src/topics.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/topics.js b/src/topics.js
index 1541bd3fbb..385d3ae558 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -126,7 +126,7 @@ var social = require('./social');
 						user.getUsersFields(uids, ['uid', 'username', 'fullname', 'userslug', 'reputation', 'postcount', 'picture', 'signature', 'banned', 'status'], next);
 					},
 					categories: function(next) {
-						categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'bgColor', 'color', 'disabled'], next);
+						categories.getCategoriesFields(cids, ['cid', 'name', 'slug', 'icon', 'image', 'bgColor', 'color', 'disabled'], next);
 					},
 					hasRead: function(next) {
 						Topics.hasReadTopics(tids, uid, next);