From a22300746cefe71a4e33b6fd3b83911c00ac100d Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 3 Mar 2015 14:03:40 -0500
Subject: [PATCH 1/6] latest tjs

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

diff --git a/package.json b/package.json
index a3a37a08c3..6f38b87f0d 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "^0.1.22",
+    "templates.js": "^0.1.23",
     "uglify-js": "git+https://github.com/julianlam/UglifyJS2.git",
     "underscore": "~1.7.0",
     "validator": "^3.30.0",

From 80945eff7eed931fb25bdee4722e02b17db87bc7 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 3 Mar 2015 14:19:18 -0500
Subject: [PATCH 2/6] closes #2819

---
 src/plugins.js                     | 1 +
 src/views/admin/extend/plugins.tpl | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/src/plugins.js b/src/plugins.js
index cb67084b28..4d384f3714 100644
--- a/src/plugins.js
+++ b/src/plugins.js
@@ -209,6 +209,7 @@ var fs = require('fs'),
 					pluginMap[plugin.id].description = plugin.description;
 					pluginMap[plugin.id].url = pluginMap[plugin.id].url || plugin.url;
 					pluginMap[plugin.id].installed = true;
+					pluginMap[plugin.id].isTheme = !!plugin.id.match('nodebb-theme-');
 					pluginMap[plugin.id].error = plugin.error || false;
 					pluginMap[plugin.id].active = plugin.active;
 					pluginMap[plugin.id].version = plugin.version;
diff --git a/src/views/admin/extend/plugins.tpl b/src/views/admin/extend/plugins.tpl
index 64f6f649c4..dc39b80103 100644
--- a/src/views/admin/extend/plugins.tpl
+++ b/src/views/admin/extend/plugins.tpl
@@ -9,7 +9,11 @@
 					<!-- IF !plugins.error -->
 					<li data-plugin-id="{plugins.id}" data-version="{plugins.version}" class="clearfix">
 						<div class="pull-right">
+							<!-- IF plugins.isTheme -->
+							<a href="{config.relative_path}/admin/appearance/themes" class="btn btn-info">Themes</a>
+							<!-- ELSE -->
 							<button data-action="toggleActive" class="btn <!-- IF plugins.active --> btn-warning<!-- ELSE --> btn-success<!-- ENDIF plugins.active -->"><i class="fa fa-power-off"></i> <!-- IF plugins.active -->Deactivate<!-- ELSE -->Activate<!-- ENDIF plugins.active --></button>
+							<!-- ENDIF plugins.isTheme -->
 
 							<button data-action="toggleInstall" data-installed="1" class="btn btn-danger"><i class="fa fa-trash-o"></i> Uninstall</button>
 						</div>

From 9bf55c96d265fa8150d5dcaabf3cad0eab6043e4 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 3 Mar 2015 15:46:57 -0500
Subject: [PATCH 3/6] closes #2818

---
 public/src/modules/helpers.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/public/src/modules/helpers.js b/public/src/modules/helpers.js
index 149e13cf0a..9f643d8736 100644
--- a/public/src/modules/helpers.js
+++ b/public/src/modules/helpers.js
@@ -16,8 +16,13 @@
 		if (properties) {
 			if (properties.loggedIn && !data.loggedIn ||
 				properties.adminOnly && !data.isAdmin ||
-				properties.installed && properties.installed.search && !data.searchEnabled ||
-				properties.hideIfPrivate && data.privateUserInfo) {
+				properties.installed && properties.installed.search && !data.searchEnabled) {
+				return false;
+			}
+		}
+
+		if (item.route.match('/users')) {
+			if (data.privateUserInfo && !data.isAdmin) {
 				return false;
 			}
 		}

From f082270f2507827a75e1acef53de6983c47b144e Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 3 Mar 2015 15:47:23 -0500
Subject: [PATCH 4/6] got rid of hideIfPrivate

---
 install/data/navigation.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/install/data/navigation.json b/install/data/navigation.json
index 99499448b0..228f9c4b3d 100644
--- a/install/data/navigation.json
+++ b/install/data/navigation.json
@@ -43,8 +43,7 @@
 		"textClass": "visible-xs-inline",
 		"text": "\\[\\[global:header.users\\]\\]",
 		"properties": {
-			"loggedIn": true,
-			"hideIfPrivate": true
+			"loggedIn": true
 		}
 	},
 	{

From 3c9431b2fcc07fdd44f9d2356942524970d114f2 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 3 Mar 2015 15:50:21 -0500
Subject: [PATCH 5/6] socket.io/plugin updated instructions to use
 require.main.require instead

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

diff --git a/src/socket.io/plugins.js b/src/socket.io/plugins.js
index 52dfeecc69..a4ee9bbe89 100644
--- a/src/socket.io/plugins.js
+++ b/src/socket.io/plugins.js
@@ -7,7 +7,7 @@ var	SocketPlugins = {};
 
 	How? From your plugin:
 
-		var SocketPlugins = module.parent.require('./socket.io/plugins');
+		var SocketPlugins = require.main.require('./src/socket.io/modules');
 		SocketPlugins.myPlugin = {};
 		SocketPlugins.myPlugin.myMethod = function() { ... };
 

From b777c448cfacd1e2b208e90a238722eeb64ab977 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 4 Mar 2015 16:03:58 -0500
Subject: [PATCH 6/6] closed #2803

---
 src/socket.io/admin/groups.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/socket.io/admin/groups.js b/src/socket.io/admin/groups.js
index 9700bee3ca..12dae2ceb4 100644
--- a/src/socket.io/admin/groups.js
+++ b/src/socket.io/admin/groups.js
@@ -17,7 +17,8 @@ Groups.create = function(socket, data, callback) {
 
 Groups.get = function(socket, groupName, callback) {
 	groups.get(groupName, {
-		expand: true
+		expand: true,
+		unescape: true
 	}, callback);
 };