From 50af77f42dec9a820381e1110bc3e8b4c51e2cfd Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 13:27:35 -0400
Subject: [PATCH 01/25] dropping tjs until inf loop in lav is fixed

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

diff --git a/package.json b/package.json
index 526d901336..3ad5a7faf4 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "socket.io-redis": "^0.1.3",
     "socketio-wildcard": "~0.1.1",
     "string": "^3.0.0",
-    "templates.js": "0.3.0",
+    "templates.js": "0.2.16",
     "uglify-js": "^2.4.24",
     "underscore": "~1.8.3",
     "underscore.deep": "^0.5.1",

From 04c2b3269d10539822a165b3434998a820c1f548 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 13:27:47 -0400
Subject: [PATCH 02/25] seo fixes for lavv

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

diff --git a/package.json b/package.json
index 3ad5a7faf4..651e3be6a1 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "nodebb-plugin-soundpack-default": "0.1.4",
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
-    "nodebb-theme-lavender": "2.0.10",
+    "nodebb-theme-lavender": "2.0.11",
     "nodebb-theme-persona": "3.0.62",
     "nodebb-theme-vanilla": "4.0.29",
     "nodebb-widget-essentials": "2.0.3",

From 296249ed9c66b75f8d66625161385c7d739d1d3e Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 13:34:58 -0400
Subject: [PATCH 03/25] allow new nav items to be added at the end of the list

---
 public/less/admin/general/navigation.less | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less
index bb3efac15b..235631e8bd 100644
--- a/public/less/admin/general/navigation.less
+++ b/public/less/admin/general/navigation.less
@@ -1,9 +1,7 @@
-
-
 #navigation {
-
-
 	#active-navigation {
+		width: 100%;
+
 		.active {
 			background-color: #eee;
 		}
@@ -33,5 +31,4 @@
 		list-style-type: none;
 		padding: 0;
 	}
-}
-
+}
\ No newline at end of file

From 4baeda7c099242ce6af76a100937b20f4762fc80 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 13:47:13 -0400
Subject: [PATCH 04/25] navigation acp styling / checkboxes

---
 public/less/admin/general/navigation.less |   7 +
 src/views/admin/general/navigation.tpl    | 190 +++++++++++-----------
 2 files changed, 99 insertions(+), 98 deletions(-)

diff --git a/public/less/admin/general/navigation.less b/public/less/admin/general/navigation.less
index 235631e8bd..65828a2be3 100644
--- a/public/less/admin/general/navigation.less
+++ b/public/less/admin/general/navigation.less
@@ -15,6 +15,13 @@
 		.drag-item {
 			cursor: move;
 			margin-right: 10px;
+			padding: 8px 10px;
+			margin-bottom: 5px;
+		}
+
+		p {
+			line-height: 20px;
+			min-height: 40px;
 		}
 	}
 
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index ba7f5942e5..826960e569 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -1,107 +1,99 @@
 <div id="navigation">
 	<div class="col-lg-9">
-		<div class="panel panel-default">
-			<div class="panel-heading">Active Navigation</div>
-			<div class="panel-body">
-
-				<div class="clearfix">
-					<ul id="active-navigation" class="nav navbar-nav">
-						<!-- BEGIN navigation -->
-						<li data-index="{navigation.index}" class="{navigation.class} <!-- IF navigation.selected --> active <!-- ENDIF navigation.selected -->">
-							<a href="#" title="{navigation.route}" id="{navigation.id}">
-								<!-- IF navigation.iconClass -->
-								<i class="fa fa-fw {navigation.iconClass}"></i>
-								<!-- ENDIF navigation.iconClass -->
-
-								<!-- IF navigation.text -->
-								<span class="{navigation.textClass}">{navigation.text}</span>
-								<!-- ENDIF navigation.text -->
-							</a>
-						</li>
-						<!-- END navigation -->
-					</ul>
-				</div>
-
-				<hr/>
-
-				<ul id="enabled">
-					<!-- BEGIN enabled -->
-					<li data-index="{enabled.index}" class="well <!-- IF !enabled.selected -->hidden<!-- ENDIF !enabled.selected -->">
-						<form>
-							<div class="row">
-								<div class="col-sm-6">
-
-									<div class="form-group">
-										<label>Icon:</label>
-										<br/>
-										<span class="iconPicker"><i class="fa fa-2x {enabled.iconClass}"></i>
-											<input class="form-control" type="hidden" name="iconClass" value="{enabled.iconClass}" />
-										</span>
-									</div>
-
-									<div class="form-group">
-										<label>Route:</label>
-										<input class="form-control" type="text" name="route" value="{enabled.route}" />
-									</div>
-
-									<div class="form-group">
-										<label>Tooltip:</label>
-										<input class="form-control" type="text" name="title" value="{enabled.title}" />
-									</div>
-								</div>
-
-								<div class="col-sm-6">
-									<div class="form-group">
-										<label>Text:</label>
-										<input class="form-control" type="text" name="text" value="{enabled.text}" />
-									</div>
-
-									<div class="form-group">
-										<label>Text Class: <small>optional</small></label>
-										<input class="form-control" type="text" name="textClass" value="{enabled.textClass}" />
-									</div>
+		<div class="clearfix">
+			<ul id="active-navigation" class="nav navbar-nav">
+				<!-- BEGIN navigation -->
+				<li data-index="{navigation.index}" class="{navigation.class} <!-- IF navigation.selected --> active <!-- ENDIF navigation.selected -->">
+					<a href="#" title="{navigation.route}" id="{navigation.id}">
+						<!-- IF navigation.iconClass -->
+						<i class="fa fa-fw {navigation.iconClass}"></i>
+						<!-- ENDIF navigation.iconClass -->
+
+						<!-- IF navigation.text -->
+						<span class="{navigation.textClass}">{navigation.text}</span>
+						<!-- ENDIF navigation.text -->
+					</a>
+				</li>
+				<!-- END navigation -->
+			</ul>
+		</div>
 
-									<div class="form-group">
-										<label>ID: <small>optional</small></label>
-										<input class="form-control" type="text" name="id" value="{enabled.id}" />
-									</div>
-								</div>
+		<hr/>
+
+		<ul id="enabled">
+			<!-- BEGIN enabled -->
+			<li data-index="{enabled.index}" class="well <!-- IF !enabled.selected -->hidden<!-- ENDIF !enabled.selected -->">
+				<form>
+					<div class="row">
+						<div class="col-sm-6">
+
+							<div class="form-group">
+								<label>Icon:</label>
+								<br/>
+								<span class="iconPicker"><i class="fa fa-2x {enabled.iconClass}"></i>
+									<input class="form-control" type="hidden" name="iconClass" value="{enabled.iconClass}" />
+								</span>
 							</div>
 
-							<hr />
-
-							<strong>Properties:</strong>
-							<div class="checkbox">
-								<label>
-									<input type="checkbox" name="property:adminOnly" <!-- IF enabled.properties.adminOnly -->checked<!-- ENDIF enabled.properties.adminOnly -->/> <strong>Only display to Admins</strong>
-								</label>
+							<div class="form-group">
+								<label>Route:</label>
+								<input class="form-control" type="text" name="route" value="{enabled.route}" />
 							</div>
-							<div class="checkbox">
-								<label>
-									<input type="checkbox" name="property:loggedIn" <!-- IF enabled.properties.loggedIn -->checked<!-- ENDIF enabled.properties.loggedIn -->/> <strong>Only display to logged in users</strong>
-								</label>
+
+							<div class="form-group">
+								<label>Tooltip:</label>
+								<input class="form-control" type="text" name="title" value="{enabled.title}" />
 							</div>
-							<div class="checkbox">
-								<label>
-									<input type="checkbox" name="property:targetBlank" <!-- IF enabled.properties.targetBlank -->checked<!-- ENDIF enabled.properties.targetBlank -->/> <strong>Open in a new window</strong>
-								</label>
+						</div>
+
+						<div class="col-sm-6">
+							<div class="form-group">
+								<label>Text:</label>
+								<input class="form-control" type="text" name="text" value="{enabled.text}" />
 							</div>
 
+							<div class="form-group">
+								<label>Text Class: <small>optional</small></label>
+								<input class="form-control" type="text" name="textClass" value="{enabled.textClass}" />
+							</div>
 
-							<hr />
-							<button class="btn btn-danger delete">Delete</button>
-							<!-- IF enabled.enabled -->
-							<button class="btn btn-warning toggle">Disable</button>
-							<!-- ELSE -->
-							<button class="btn btn-success toggle">Enable</button>
-							<!-- ENDIF enabled.enabled -->
-							<input type="hidden" name="enabled" value="{enabled.enabled}" />
-						</form>
-					</li>
-					<!-- END enabled -->
-				</ul>
-			</div>
-		</div>
+							<div class="form-group">
+								<label>ID: <small>optional</small></label>
+								<input class="form-control" type="text" name="id" value="{enabled.id}" />
+							</div>
+						</div>
+					</div>
+
+					<strong>Properties:</strong>
+					<div class="checkbox">
+						<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+							<input class="mdl-switch__input" type="checkbox" name="property:adminOnly" <!-- IF enabled.properties.adminOnly -->checked<!-- ENDIF enabled.properties.adminOnly -->/>
+							<span class="mdl-switch__label"><strong>Only display to Admins</strong></span>
+						</label>
+					</div>
+					<div class="checkbox">
+						<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+							<input class="mdl-switch__input" type="checkbox" name="property:loggedIn" <!-- IF enabled.properties.loggedIn -->checked<!-- ENDIF enabled.properties.loggedIn -->/> <span class="mdl-switch__label"><strong>Only display to logged in users</strong></span>
+						</label>
+					</div>
+					<div class="checkbox">
+						<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect">
+							<input class="mdl-switch__input" type="checkbox" name="property:targetBlank" <!-- IF enabled.properties.targetBlank -->checked<!-- ENDIF enabled.properties.targetBlank -->/>
+							<span class="mdl-switch__label"><strong>Open in a new window</strong></span>
+						</label>
+					</div>
+
+					<button class="btn btn-danger delete">Delete</button>
+					<!-- IF enabled.enabled -->
+					<button class="btn btn-warning toggle">Disable</button>
+					<!-- ELSE -->
+					<button class="btn btn-success toggle">Enable</button>
+					<!-- ENDIF enabled.enabled -->
+					<input type="hidden" name="enabled" value="{enabled.enabled}" />
+				</form>
+			</li>
+			<!-- END enabled -->
+		</ul>
 	</div>
 
 	<div class="col-lg-3">
@@ -110,14 +102,16 @@
 			<div class="panel-body">
 				<ul id="available">
 					<li data-id="custom" class="clearfix">
-						<div data-id="custom" class="drag-item alert alert-warning pull-left">
-							<i class="fa fa-fw fa-navicon"></i>
+						<div data-id="custom" class="drag-item alert alert-success pull-left">
+							<i class="fa fa-fw fa-plus-circle"></i>
 						</div>
-						<strong>Custom Route</strong>
+						<p>
+							<strong>Custom Route</strong>
+						</p>
 					</li>
 					<!-- BEGIN available -->
 					<li data-id="@index" class="clearfix">
-						<div data-id="@index" class="drag-item alert <!-- IF available.core -->alert-info<!-- ELSE -->alert-success<!-- ENDIF available.core --> pull-left">
+						<div data-id="@index" class="drag-item alert <!-- IF available.core -->alert-warning<!-- ELSE -->alert-info<!-- ENDIF available.core --> pull-left">
 							<i class="fa fa-fw <!-- IF available.iconClass -->{available.iconClass}<!-- ELSE -->fa-navicon<!-- ENDIF available.iconClass -->"></i>
 						</div>
 						<p>

From 69e43cd35a86d5cacd0d104c8ff503a195421635 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 14:22:19 -0400
Subject: [PATCH 05/25] modularized coverPhoto

---
 public/src/client/groups/details.js | 114 +++++-----------------------
 public/src/modules/coverPhoto.js    |  93 +++++++++++++++++++++++
 2 files changed, 112 insertions(+), 95 deletions(-)
 create mode 100644 public/src/modules/coverPhoto.js

diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index be624b2160..3a9e21387c 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -5,14 +5,11 @@ define('forum/groups/details', [
 	'forum/groups/memberlist',
 	'iconSelect',
 	'components',
-	'vendor/colorpicker/colorpicker',
-	'vendor/jquery/draggable-background/backgroundDraggable'
-], function(memberList, iconSelect, components) {
-
-	var Details = {
-			cover: {}
-		};
+	'coverPhoto',
+	'vendor/colorpicker/colorpicker'
+], function(memberList, iconSelect, components, coverPhoto) {
 
+	var Details = {};
 	var groupName;
 
 	Details.init = function() {
@@ -22,7 +19,21 @@ define('forum/groups/details', [
 
 		if (ajaxify.data.group.isOwner) {
 			Details.prepareSettings();
-			Details.initialiseCover();
+
+			coverPhoto.init(components.get('groups/cover'),
+				function(callback) {
+					socket.emit('groups.cover.get', {
+						groupName: groupName
+					}, callback)
+				},
+				function(imageData, position, callback) {
+					socket.emit('groups.cover.update', {
+						groupName: groupName,
+						imageData: coverPhoto.newCover || undefined,
+						position: components.get('groups/cover').css('background-position')
+					}, callback);
+				}
+			);
 		}
 
 		memberList.init();
@@ -209,93 +220,6 @@ define('forum/groups/details', [
 		});
 	};
 
-	// Cover Photo Handling Code
-
-	Details.initialiseCover = function() {
-		var coverEl = components.get('groups/cover');
-		coverEl.find('.change').on('click', function() {
-			coverEl.toggleClass('active', 1);
-			coverEl.backgroundDraggable({
-				axis: 'y',
-				units: 'percent'
-			});
-			coverEl.on('dragover', Details.cover.onDragOver);
-			coverEl.on('drop', Details.cover.onDrop);
-		});
-
-		coverEl.find('.save').on('click', Details.cover.save);
-		coverEl.addClass('initialised');
-	};
-
-	Details.cover.load = function() {
-		socket.emit('groups.cover.get', {
-			groupName: groupName
-		}, function(err, data) {
-			if (!err) {
-				var coverEl = components.get('groups/cover');
-				if (data['cover:url']) {
-					coverEl.css('background-image', 'url(' + data['cover:url'] + ')');
-				}
-
-				if (data['cover:position']) {
-					coverEl.css('background-position', data['cover:position']);
-				}
-
-				delete Details.cover.newCover;
-			} else {
-				app.alertError(err.message);
-			}
-		});
-	};
-
-	Details.cover.onDragOver = function(e) {
-		e.stopPropagation();
-		e.preventDefault();
-		e.originalEvent.dataTransfer.dropEffect = 'copy';
-	};
-
-	Details.cover.onDrop = function(e) {
-		var coverEl = components.get('groups/cover');
-		e.stopPropagation();
-		e.preventDefault();
-
-		var files = e.originalEvent.dataTransfer.files,
-		reader = new FileReader();
-
-		if (files.length && files[0].type.match('image.*')) {
-			reader.onload = function(e) {
-				coverEl.css('background-image', 'url(' + e.target.result + ')');
-				Details.cover.newCover = e.target.result;
-			};
-
-			reader.readAsDataURL(files[0]);
-		}
-	};
-
-	Details.cover.save = function() {
-		var coverEl = components.get('groups/cover');
-
-		coverEl.addClass('saving');
-
-		socket.emit('groups.cover.update', {
-			groupName: groupName,
-			imageData: Details.cover.newCover || undefined,
-			position: components.get('groups/cover').css('background-position')
-		}, function(err) {
-			if (!err) {
-				coverEl.toggleClass('active', 0);
-				coverEl.backgroundDraggable('disable');
-				coverEl.off('dragover', Details.cover.onDragOver);
-				coverEl.off('drop', Details.cover.onDrop);
-				Details.cover.load();
-			} else {
-				app.alertError(err.message);
-			}
-
-			coverEl.removeClass('saving');
-		});
-	};
-
 	function handleMemberInvitations() {
 		if (ajaxify.data.group.isOwner) {
 			var searchInput = $('[component="groups/members/invite"]');
diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
new file mode 100644
index 0000000000..bed4ffd41c
--- /dev/null
+++ b/public/src/modules/coverPhoto.js
@@ -0,0 +1,93 @@
+"use strict";
+/* globals define, app*/
+
+define('coverPhoto', [
+	'vendor/jquery/draggable-background/backgroundDraggable'
+], function() {
+
+	var coverPhoto = {
+		coverEl: null,
+		getFn: null,
+		saveFn: null
+	};
+
+	coverPhoto.init = function(coverEl, getFn, saveFn) {
+		coverPhoto.coverEl = coverEl;
+		coverPhoto.getFn = getFn;
+		coverPhoto.saveFn = saveFn;
+
+		coverEl.find('.change').on('click', function() {
+			coverEl.toggleClass('active', 1);
+			coverEl.backgroundDraggable({
+				axis: 'y',
+				units: 'percent'
+			});
+			coverEl.on('dragover', coverPhoto.onDragOver);
+			coverEl.on('drop', coverPhoto.onDrop);
+		});
+
+		coverEl.find('.save').on('click', coverPhoto.save);
+		coverEl.addClass('initialised');
+	};
+
+	coverPhoto.load = function() {
+		coverPhoto.getFn(function(err, data) {
+			if (!err) {
+				if (data['cover:url']) {
+					coverPhoto.coverEl.css('background-image', 'url(' + data['cover:url'] + ')');
+				}
+
+				if (data['cover:position']) {
+					coverPhoto.coverEl.css('background-position', data['cover:position']);
+				}
+
+				delete coverPhoto.newCover;
+			} else {
+				app.alertError(err.message);
+			}
+		});
+	};
+
+	coverPhoto.onDragOver = function(e) {
+		e.stopPropagation();
+		e.preventDefault();
+		e.originalEvent.dataTransfer.dropEffect = 'copy';
+	};
+
+	coverPhoto.onDrop = function(e) {
+		e.stopPropagation();
+		e.preventDefault();
+
+		var files = e.originalEvent.dataTransfer.files,
+		reader = new FileReader();
+
+		if (files.length && files[0].type.match('image.*')) {
+			reader.onload = function(e) {
+				coverPhoto.coverEl.css('background-image', 'url(' + e.target.result + ')');
+				coverPhoto.newCover = e.target.result;
+			};
+
+			reader.readAsDataURL(files[0]);
+		}
+	};
+
+	coverPhoto.save = function() {
+		coverPhoto.coverEl.addClass('saving');
+
+		coverPhoto.saveFn(coverPhoto.newCover || undefined, coverPhoto.coverEl.css('background-position'), function(err) {
+			if (!err) {
+				coverPhoto.coverEl.toggleClass('active', 0);
+				coverPhoto.coverEl.backgroundDraggable('disable');
+				coverPhoto.coverEl.off('dragover', coverPhoto.onDragOver);
+				coverPhoto.coverEl.off('drop', coverPhoto.onDrop);
+				coverPhoto.load();
+			} else {
+				app.alertError(err.message);
+			}
+
+			coverPhoto.coverEl.removeClass('saving');
+		});
+	};
+
+	return coverPhoto;
+});
\ No newline at end of file

From aae393ebe13b3a3a4a53c22143f71416fea3180b Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 28 Oct 2015 15:06:19 -0400
Subject: [PATCH 06/25] closes #3794

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

diff --git a/public/src/client/topic.js b/public/src/client/topic.js
index faaaddbf00..c216943e32 100644
--- a/public/src/client/topic.js
+++ b/public/src/client/topic.js
@@ -18,6 +18,11 @@ define('forum/topic', [
 		currentUrl = '';
 
 	$(window).on('action:ajaxify.start', function(ev, data) {
+		if (Topic.replaceURLTimeout) {
+			clearTimeout(Topic.replaceURLTimeout);
+			Topic.replaceURLTimeout = 0;
+		}
+
 		if (ajaxify.currentPage !== data.url) {
 			navigator.disable();
 			components.get('navbar/title').find('span').text('').hide();

From 47c71b5a372bd210200557ab1eeaea3afdac7ec2 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 28 Oct 2015 15:10:27 -0400
Subject: [PATCH 07/25] closes
 https://github.com/NodeBB/nodebb-theme-persona/issues/181

---
 src/privileges/categories.js | 3 +++
 src/socket.io/posts/tools.js | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/privileges/categories.js b/src/privileges/categories.js
index 31d1deeeb3..d51edbb9a8 100644
--- a/src/privileges/categories.js
+++ b/src/privileges/categories.js
@@ -191,6 +191,9 @@ module.exports = function(privileges) {
 	};
 
 	privileges.categories.isAdminOrMod = function(cid, uid, callback) {
+		if (!parseInt(uid, 10)) {
+			return callback(null, false);
+		}
 		helpers.some([
 			function (next) {
 				user.isModerator(uid, cid, next);
diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js
index fc4491ea44..d05c2b74be 100644
--- a/src/socket.io/posts/tools.js
+++ b/src/socket.io/posts/tools.js
@@ -13,9 +13,6 @@ var favourites = require('../../favourites');
 module.exports = function(SocketPosts) {
 
 	SocketPosts.loadPostTools = function(socket, data, callback) {
-		if (!socket.uid) {
-			return;
-		}
 		if (!data) {
 			return callback(new Error('[[error:invalid-data]]'))
 		}
@@ -37,7 +34,7 @@ module.exports = function(SocketPosts) {
 			results.posts.tools = []; // TODO: add filter for this
 			results.posts.deleted = parseInt(results.posts.deleted, 10) === 1;
 			results.posts.favourited = results.favourited[0];
-			results.posts.selfPost = socket.uid === parseInt(results.posts.uid, 10);
+			results.posts.selfPost = socket.uid && socket.uid === parseInt(results.posts.uid, 10);
 			results.posts.display_moderator_tools = results.isAdminOrMod || results.posts.selfPost;
 			results.posts.display_move_tools = results.isAdminOrMod;
 			callback(null, results);

From 887358f045a51e57196ccb0212ee1410ce86a836 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 28 Oct 2015 15:16:14 -0400
Subject: [PATCH 08/25] closes #3784

---
 public/src/client/topic/events.js |  1 +
 public/src/client/topic/posts.js  | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/public/src/client/topic/events.js b/public/src/client/topic/events.js
index 7dfe57beed..7e04a5ffae 100644
--- a/public/src/client/topic/events.js
+++ b/public/src/client/topic/events.js
@@ -118,6 +118,7 @@ define('forum/topic/events', [
 			editedPostEl.html(data.post.content);
 			editedPostEl.find('img:not(.not-responsive)').addClass('img-responsive');
 			app.replaceSelfLinks(editedPostEl.find('a'));
+			posts.wrapImagesInLinks(editedPostEl.parent());
 			editedPostEl.fadeIn(250);
 			$(window).trigger('action:posts.edited', data);
 		});
diff --git a/public/src/client/topic/posts.js b/public/src/client/topic/posts.js
index 02fdfbc26f..89c9e70e1d 100644
--- a/public/src/client/topic/posts.js
+++ b/public/src/client/topic/posts.js
@@ -217,15 +217,19 @@ define('forum/topic/posts', [
 		utils.addCommasToNumbers(posts.find('.formatted-number'));
 		utils.makeNumbersHumanReadable(posts.find('.human-readable-number'));
 		posts.find('.timeago').timeago();
+		Posts.wrapImagesInLinks(posts);
+
+		addBlockquoteEllipses(posts.find('[component="post/content"] > blockquote > blockquote'));
+		hidePostToolsForDeletedPosts(posts);
+	};
+
+	Posts.wrapImagesInLinks = function(posts) {
 		posts.find('[component="post/content"] img:not(.emoji)').each(function() {
 			var $this = $(this);
 			if (!$this.parent().is('a')) {
 				$this.wrap('<a href="' + $this.attr('src') + '" target="_blank">');
 			}
 		});
-
-		addBlockquoteEllipses(posts.find('[component="post/content"] > blockquote > blockquote'));
-		hidePostToolsForDeletedPosts(posts);
 	};
 
 	Posts.showBottomPostBar = function() {

From 61b1f5fe32a463f32aaf12215602d8cb8d0ca621 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 15:22:54 -0400
Subject: [PATCH 09/25] allow regular uploading (modal) of cover photo

---
 public/src/modules/coverPhoto.js |  9 ++++++++-
 src/controllers/groups.js        | 15 +++++++++++++++
 src/groups/update.js             | 20 +++++++++++++++++---
 src/routes/api.js                |  2 ++
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
index bed4ffd41c..d5ca6c0142 100644
--- a/public/src/modules/coverPhoto.js
+++ b/public/src/modules/coverPhoto.js
@@ -2,8 +2,9 @@
 /* globals define, app*/
 
 define('coverPhoto', [
+	'uploader',
 	'vendor/jquery/draggable-background/backgroundDraggable'
-], function() {
+], function(uploader) {
 
 	var coverPhoto = {
 		coverEl: null,
@@ -17,6 +18,12 @@ define('coverPhoto', [
 		coverPhoto.saveFn = saveFn;
 
 		coverEl.find('.change').on('click', function() {
+			uploader.open(RELATIVE_PATH + '/api/groups/uploadpicture', { groupName: 'administrators' }, 0, function(imageUrlOnServer) {
+				console.log(imageUrlOnServer);
+				coverPhoto.coverEl.css('background-image', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')');
+			});
+
+			return;
 			coverEl.toggleClass('active', 1);
 			coverEl.backgroundDraggable({
 				axis: 'y',
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index 7d37a5ca2a..8a6faaf755 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -132,4 +132,19 @@ groupsController.members = function(req, res, next) {
 	});
 };
 
+groupsController.uploadCover = function(req, res, next) {
+	var params = JSON.parse(req.body.params);
+	
+	groups.updateCover({
+		file: req.files.files[0].path,
+		groupName: params.groupName
+	}, function(err, image) {
+		if (err) {
+			return next(err);
+		}
+
+		res.json([{url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url}]);
+	})
+};
+
 module.exports = groupsController;
diff --git a/src/groups/update.js b/src/groups/update.js
index 595a839ed7..4c5c30c193 100644
--- a/src/groups/update.js
+++ b/src/groups/update.js
@@ -123,6 +123,10 @@ module.exports = function(Groups) {
 
 		async.series([
 			function(next) {
+				if (data.file) {
+					return next();
+				}
+
 				// Calculate md5sum of image
 				// This is required because user data can be private
 				md5sum = crypto.createHash('md5');
@@ -131,6 +135,10 @@ module.exports = function(Groups) {
 				next();
 			},
 			function(next) {
+				if (data.file) {
+					return next();
+				}
+
 				// Save image
 				tempPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), md5sum);
 				var buffer = new Buffer(data.imageData.slice(data.imageData.indexOf('base64') + 7), 'base64');
@@ -142,7 +150,7 @@ module.exports = function(Groups) {
 			function(next) {
 				uploadsController.uploadGroupCover({
 					name: 'groupCover',
-					path: tempPath
+					path: data.file ? data.file : tempPath
 				}, function(err, uploadData) {
 					if (err) {
 						return next(err);
@@ -156,14 +164,20 @@ module.exports = function(Groups) {
 				Groups.setGroupField(data.groupName, 'cover:url', url, next);
 			},
 			function(next) {
-				fs.unlink(tempPath, next);	// Delete temporary file
+				fs.unlink(data.file ? data.file : tempPath, next);	// Delete temporary file
 			}
 		], function(err) {
 			if (err) {
 				return callback(err);
 			}
 
-			Groups.updateCoverPosition(data.groupName, data.position, callback);
+			if (data.position) {
+				Groups.updateCoverPosition(data.groupName, data.position, function(err) {
+					callback(err, {url: url});
+				});
+			} else {
+				callback(err, {url: url});
+			}
 		});
 	};
 
diff --git a/src/routes/api.js b/src/routes/api.js
index a888c20747..402bf85341 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -28,5 +28,7 @@ module.exports =  function(app, middleware, controllers) {
 	router.post('/post/upload', middlewares, uploadsController.uploadPost);
 	router.post('/topic/thumb/upload', middlewares, uploadsController.uploadThumb);
 	router.post('/user/:userslug/uploadpicture', middlewares.concat([middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions]), controllers.accounts.edit.uploadPicture);
+
+	router.post('/groups/uploadpicture', middlewares.concat([middleware.authenticate]), controllers.groups.uploadCover);
 };
 

From a6796479bfe8c9aa7cdbe4659549d3e429a8842a Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 15:46:48 -0400
Subject: [PATCH 10/25] fixed drag and drop image upload

---
 public/src/modules/coverPhoto.js | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
index d5ca6c0142..2c8f2db96b 100644
--- a/public/src/modules/coverPhoto.js
+++ b/public/src/modules/coverPhoto.js
@@ -17,22 +17,25 @@ define('coverPhoto', [
 		coverPhoto.getFn = getFn;
 		coverPhoto.saveFn = saveFn;
 
-		coverEl.find('.change').on('click', function() {
+		coverEl.find('.upload').on('click', function() {
 			uploader.open(RELATIVE_PATH + '/api/groups/uploadpicture', { groupName: 'administrators' }, 0, function(imageUrlOnServer) {
-				console.log(imageUrlOnServer);
 				coverPhoto.coverEl.css('background-image', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')');
 			});
+		});
 
-			return;
-			coverEl.toggleClass('active', 1);
-			coverEl.backgroundDraggable({
-				axis: 'y',
-				units: 'percent'
-			});
-			coverEl.on('dragover', coverPhoto.onDragOver);
-			coverEl.on('drop', coverPhoto.onDrop);
+		coverEl.find('.resize').on('click', function() {
+			coverEl
+				.toggleClass('active', 1)
+				.backgroundDraggable({
+					axis: 'y',
+					units: 'percent'
+				})
 		});
 
+		coverEl
+			.on('dragover', coverPhoto.onDragOver)
+			.on('drop', coverPhoto.onDrop);
+
 		coverEl.find('.save').on('click', coverPhoto.save);
 		coverEl.addClass('initialised');
 	};
@@ -75,6 +78,13 @@ define('coverPhoto', [
 			};
 
 			reader.readAsDataURL(files[0]);
+
+			coverPhoto.coverEl
+				.addClass('active', 1)
+				.backgroundDraggable({
+					axis: 'y',
+					units: 'percent'
+				})
 		}
 	};
 

From e121c98a4f03991d58a5537cff26659a26fa0345 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 15:59:05 -0400
Subject: [PATCH 11/25] up'd themes

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

diff --git a/package.json b/package.json
index 651e3be6a1..ebbaf9a80c 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
     "nodebb-theme-lavender": "2.0.11",
-    "nodebb-theme-persona": "3.0.62",
-    "nodebb-theme-vanilla": "4.0.29",
+    "nodebb-theme-persona": "3.0.63",
+    "nodebb-theme-vanilla": "4.0.30",
     "nodebb-widget-essentials": "2.0.3",
     "npm": "^2.1.4",
     "passport": "^0.3.0",

From 13c1dbe178131d8237e3d3063873ff25a5e1fa48 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 16:15:29 -0400
Subject: [PATCH 12/25] up'd persona

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

diff --git a/package.json b/package.json
index ebbaf9a80c..8e19eca779 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
     "nodebb-theme-lavender": "2.0.11",
-    "nodebb-theme-persona": "3.0.63",
+    "nodebb-theme-persona": "3.0.65",
     "nodebb-theme-vanilla": "4.0.30",
     "nodebb-widget-essentials": "2.0.3",
     "npm": "^2.1.4",

From ef20141e8f4e7d482b50005e6775eeb48e5bd879 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 16:17:27 -0400
Subject: [PATCH 13/25] jshint

---
 public/src/modules/coverPhoto.js |  6 +++---
 src/controllers/api.js           | 12 +++++-------
 src/controllers/groups.js        |  3 +--
 src/groups/update.js             |  4 +---
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
index 2c8f2db96b..6f210ce600 100644
--- a/public/src/modules/coverPhoto.js
+++ b/public/src/modules/coverPhoto.js
@@ -1,5 +1,5 @@
 "use strict";
-/* globals define, app*/
+/* globals define, app, RELATIVE_PATH */
 
 define('coverPhoto', [
 	'uploader',
@@ -29,7 +29,7 @@ define('coverPhoto', [
 				.backgroundDraggable({
 					axis: 'y',
 					units: 'percent'
-				})
+				});
 		});
 
 		coverEl
@@ -84,7 +84,7 @@ define('coverPhoto', [
 				.backgroundDraggable({
 					axis: 'y',
 					units: 'percent'
-				})
+				});
 		}
 	};
 
diff --git a/src/controllers/api.js b/src/controllers/api.js
index 421673e7c4..9a6fbee238 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -112,13 +112,11 @@ apiController.getConfig = function(req, res, next) {
 
 
 apiController.renderWidgets = function(req, res, next) {
-	var async = require('async'),
-		areas = {
-			template: req.query.template,
-			locations: req.query.locations,
-			url: req.query.url
-		},
-		renderedWidgets = [];
+	var areas = {
+		template: req.query.template,
+		locations: req.query.locations,
+		url: req.query.url
+	};
 
 	if (!areas.template || !areas.locations) {
 		return res.status(200).json({});
diff --git a/src/controllers/groups.js b/src/controllers/groups.js
index 8a6faaf755..111d41a752 100644
--- a/src/controllers/groups.js
+++ b/src/controllers/groups.js
@@ -3,7 +3,6 @@
 var async = require('async'),
 	nconf = require('nconf'),
 	validator = require('validator'),
-	db = require('../database'),
 	meta = require('../meta'),
 	groups = require('../groups'),
 	user = require('../user'),
@@ -144,7 +143,7 @@ groupsController.uploadCover = function(req, res, next) {
 		}
 
 		res.json([{url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url}]);
-	})
+	});
 };
 
 module.exports = groupsController;
diff --git a/src/groups/update.js b/src/groups/update.js
index 4c5c30c193..a92ed3bc2b 100644
--- a/src/groups/update.js
+++ b/src/groups/update.js
@@ -104,9 +104,7 @@ module.exports = function(Groups) {
 		async.parallel([
 			async.apply(db.setObjectField, 'group:' + groupName, 'hidden', hidden ? 1 : 0),
 			async.apply(updateVisibility, groupName, hidden)
-		], function(err, results) {
-			callback(err);
-		});
+		], callback);
 	}
 
 	Groups.updateCoverPosition = function(groupName, position, callback) {

From a4cae65732eccf089a63cc496a4a5732a794057e Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 16:23:42 -0400
Subject: [PATCH 14/25] fixed hardcoded group name in uploader + cleanup

---
 public/src/client/groups/details.js | 16 +++++++++++-----
 public/src/modules/coverPhoto.js    | 13 ++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index 3a9e21387c..20cf225ddf 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -1,13 +1,14 @@
 "use strict";
-/* globals define, socket, ajaxify, app, bootbox, utils */
+/* globals define, socket, ajaxify, app, bootbox, utils, RELATIVE_PATH */
 
 define('forum/groups/details', [
 	'forum/groups/memberlist',
 	'iconSelect',
 	'components',
 	'coverPhoto',
+	'uploader',
 	'vendor/colorpicker/colorpicker'
-], function(memberList, iconSelect, components, coverPhoto) {
+], function(memberList, iconSelect, components, coverPhoto, uploader) {
 
 	var Details = {};
 	var groupName;
@@ -24,14 +25,19 @@ define('forum/groups/details', [
 				function(callback) {
 					socket.emit('groups.cover.get', {
 						groupName: groupName
-					}, callback)
+					}, callback);
 				},
 				function(imageData, position, callback) {
 					socket.emit('groups.cover.update', {
 						groupName: groupName,
-						imageData: coverPhoto.newCover || undefined,
-						position: components.get('groups/cover').css('background-position')
+						imageData: imageData,
+						position: position
 					}, callback);
+				},
+				function() {
+					uploader.open(RELATIVE_PATH + '/api/groups/uploadpicture', { groupName: groupName }, 0, function(imageUrlOnServer) {
+						components.get('groups/cover').css('background-image', 'url(' + imageUrlOnServer + ')');
+					});
 				}
 			);
 		}
diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
index 6f210ce600..f96b531be6 100644
--- a/public/src/modules/coverPhoto.js
+++ b/public/src/modules/coverPhoto.js
@@ -1,10 +1,9 @@
 "use strict";
-/* globals define, app, RELATIVE_PATH */
+/* globals define, app */
 
 define('coverPhoto', [
-	'uploader',
 	'vendor/jquery/draggable-background/backgroundDraggable'
-], function(uploader) {
+], function() {
 
 	var coverPhoto = {
 		coverEl: null,
@@ -12,16 +11,12 @@ define('coverPhoto', [
 		saveFn: null
 	};
 
-	coverPhoto.init = function(coverEl, getFn, saveFn) {
+	coverPhoto.init = function(coverEl, getFn, saveFn, uploadFn) {
 		coverPhoto.coverEl = coverEl;
 		coverPhoto.getFn = getFn;
 		coverPhoto.saveFn = saveFn;
 
-		coverEl.find('.upload').on('click', function() {
-			uploader.open(RELATIVE_PATH + '/api/groups/uploadpicture', { groupName: 'administrators' }, 0, function(imageUrlOnServer) {
-				coverPhoto.coverEl.css('background-image', 'url(' + imageUrlOnServer + '?' + new Date().getTime() + ')');
-			});
-		});
+		coverEl.find('.upload').on('click', uploadFn);
 
 		coverEl.find('.resize').on('click', function() {
 			coverEl

From 80da65b4ef0e82321937d005d63cf536dd6b6374 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 16:24:59 -0400
Subject: [PATCH 15/25] unused lang strings

---
 public/language/en_GB/groups.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/public/language/en_GB/groups.json b/public/language/en_GB/groups.json
index d800d74b1c..fcd15e21c6 100644
--- a/public/language/en_GB/groups.json
+++ b/public/language/en_GB/groups.json
@@ -19,8 +19,6 @@
 	"request.notification_title": "Group Membership Request from <strong>%1</strong>",
 	"request.notification_text": "<strong>%1</strong> has requested to become a member of <strong>%2</strong>",
 
-	"cover-instructions": "Drag and Drop a photo, drag to position, and hit <strong>Save</strong>",
-	"cover-change": "Change",
 	"cover-save": "Save",
 	"cover-saving": "Saving",
 

From 973da9bdcc88f18ad8ef50b5f9d71e3b8fa80681 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 16:29:00 -0400
Subject: [PATCH 16/25] up persona

---
 package.json                     | 2 +-
 public/src/modules/coverPhoto.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 8e19eca779..25a0b46228 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
     "nodebb-theme-lavender": "2.0.11",
-    "nodebb-theme-persona": "3.0.65",
+    "nodebb-theme-persona": "3.0.66",
     "nodebb-theme-vanilla": "4.0.30",
     "nodebb-widget-essentials": "2.0.3",
     "npm": "^2.1.4",
diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
index f96b531be6..f49267a80e 100644
--- a/public/src/modules/coverPhoto.js
+++ b/public/src/modules/coverPhoto.js
@@ -17,7 +17,6 @@ define('coverPhoto', [
 		coverPhoto.saveFn = saveFn;
 
 		coverEl.find('.upload').on('click', uploadFn);
-
 		coverEl.find('.resize').on('click', function() {
 			coverEl
 				.toggleClass('active', 1)

From 02d130418571f8c7608480a551a52972bdb615da Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 17:04:02 -0400
Subject: [PATCH 17/25] removing groups.cover.get, seemingly it doesn't do
 anything

---
 public/src/client/groups/details.js |  5 -----
 public/src/modules/coverPhoto.js    | 23 +----------------------
 src/socket.io/groups.js             |  4 ----
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/public/src/client/groups/details.js b/public/src/client/groups/details.js
index 20cf225ddf..2169fd07f5 100644
--- a/public/src/client/groups/details.js
+++ b/public/src/client/groups/details.js
@@ -22,11 +22,6 @@ define('forum/groups/details', [
 			Details.prepareSettings();
 
 			coverPhoto.init(components.get('groups/cover'),
-				function(callback) {
-					socket.emit('groups.cover.get', {
-						groupName: groupName
-					}, callback);
-				},
 				function(imageData, position, callback) {
 					socket.emit('groups.cover.update', {
 						groupName: groupName,
diff --git a/public/src/modules/coverPhoto.js b/public/src/modules/coverPhoto.js
index f49267a80e..3d36d6d710 100644
--- a/public/src/modules/coverPhoto.js
+++ b/public/src/modules/coverPhoto.js
@@ -7,13 +7,11 @@ define('coverPhoto', [
 
 	var coverPhoto = {
 		coverEl: null,
-		getFn: null,
 		saveFn: null
 	};
 
-	coverPhoto.init = function(coverEl, getFn, saveFn, uploadFn) {
+	coverPhoto.init = function(coverEl, saveFn, uploadFn) {
 		coverPhoto.coverEl = coverEl;
-		coverPhoto.getFn = getFn;
 		coverPhoto.saveFn = saveFn;
 
 		coverEl.find('.upload').on('click', uploadFn);
@@ -34,24 +32,6 @@ define('coverPhoto', [
 		coverEl.addClass('initialised');
 	};
 
-	coverPhoto.load = function() {
-		coverPhoto.getFn(function(err, data) {
-			if (!err) {
-				if (data['cover:url']) {
-					coverPhoto.coverEl.css('background-image', 'url(' + data['cover:url'] + ')');
-				}
-
-				if (data['cover:position']) {
-					coverPhoto.coverEl.css('background-position', data['cover:position']);
-				}
-
-				delete coverPhoto.newCover;
-			} else {
-				app.alertError(err.message);
-			}
-		});
-	};
-
 	coverPhoto.onDragOver = function(e) {
 		e.stopPropagation();
 		e.preventDefault();
@@ -91,7 +71,6 @@ define('coverPhoto', [
 				coverPhoto.coverEl.backgroundDraggable('disable');
 				coverPhoto.coverEl.off('dragover', coverPhoto.onDragOver);
 				coverPhoto.coverEl.off('drop', coverPhoto.onDrop);
-				coverPhoto.load();
 			} else {
 				app.alertError(err.message);
 			}
diff --git a/src/socket.io/groups.js b/src/socket.io/groups.js
index 9807e821b8..d5d2cc926f 100644
--- a/src/socket.io/groups.js
+++ b/src/socket.io/groups.js
@@ -228,10 +228,6 @@ SocketGroups.loadMoreMembers = function(socket, data, callback) {
 
 SocketGroups.cover = {};
 
-SocketGroups.cover.get = function(socket, data, callback) {
-	groups.getGroupFields(data.groupName, ['cover:url', 'cover:position'], callback);
-};
-
 SocketGroups.cover.update = function(socket, data, callback) {
 	if (!socket.uid) {
 		return callback(new Error('[[error:no-privileges]]'));

From f19043d0469f9494c05a1d04d2cc5a2d0fbcb553 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 17:42:42 -0400
Subject: [PATCH 18/25] profile cover photos

---
 public/src/client/account/profile.js | 30 ++++++++++-
 src/controllers/accounts/edit.js     | 15 ++++++
 src/controllers/accounts/profile.js  |  3 ++
 src/controllers/uploads.js           |  6 ++-
 src/routes/api.js                    |  3 +-
 src/socket.io/user/profile.js        | 14 +++++
 src/user/picture.js                  | 76 +++++++++++++++++++++++++++-
 7 files changed, 142 insertions(+), 5 deletions(-)

diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js
index 5a7756cc93..deffc3ab9a 100644
--- a/public/src/client/account/profile.js
+++ b/public/src/client/account/profile.js
@@ -2,7 +2,14 @@
 
 /* globals define, ajaxify, app, utils, socket, bootbox */
 
-define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll', 'translator'], function(header, infinitescroll, translator) {
+define('forum/account/profile', [
+	'forum/account/header',
+	'forum/infinitescroll',
+	'translator',
+	'coverPhoto',
+	'uploader',
+	'components'
+], function(header, infinitescroll, translator, coverPhoto, uploader, components) {
 	var Account = {},
 		yourid,
 		theirid,
@@ -41,6 +48,10 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll',
 		socket.on('event:user_status_change', onUserStatusChange);
 
 		infinitescroll.init(loadMorePosts);
+
+		if (parseInt(yourid, 10) === parseInt(theirid, 10)) {
+			setupCoverPhoto();
+		}
 	};
 
 	function processPage() {
@@ -161,5 +172,22 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll',
 		});
 	}
 
+	function setupCoverPhoto() {
+		coverPhoto.init(components.get('account/cover'),
+			function(imageData, position, callback) {
+				socket.emit('user.updateCover', {
+					uid: yourid,
+					imageData: imageData,
+					position: position
+				}, callback);
+			},
+			function() {
+				uploader.open(RELATIVE_PATH + '/api/user/uploadcover', { uid: yourid }, 0, function(imageUrlOnServer) {
+					components.get('account/cover').css('background-image', 'url(' + imageUrlOnServer + ')');
+				});
+			}
+		);
+	}
+
 	return Account;
 });
diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js
index a84dc7c991..0205b60356 100644
--- a/src/controllers/accounts/edit.js
+++ b/src/controllers/accounts/edit.js
@@ -120,4 +120,19 @@ editController.uploadPicture = function (req, res, next) {
 	});
 };
 
+editController.uploadCoverPicture = function(req, res, next) {
+	var params = JSON.parse(req.body.params);
+	
+	user.updateCoverPicture({
+		file: req.files.files[0].path,
+		uid: params.uid
+	}, function(err, image) {
+		if (err) {
+			return next(err);
+		}
+
+		res.json([{url: image.url.startsWith('http') ? image.url : nconf.get('relative_path') + image.url}]);
+	});
+};
+
 module.exports = editController;
\ No newline at end of file
diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js
index e55ee0d157..5d06a62b3e 100644
--- a/src/controllers/accounts/profile.js
+++ b/src/controllers/accounts/profile.js
@@ -76,6 +76,9 @@ profileController.get = function(req, res, callback) {
 				userData.profileviews = 1;
 			}
 
+			userData['cover:url'] = userData['cover:url'] || nconf.get('relative_path') + '/images/cover-default.png';
+			userData['cover:position'] = userData['cover:position'] || '50% 50%';
+
 			plugins.fireHook('filter:user.account', {userData: userData, uid: req.uid}, next);
 		}
 	], function(err, results) {
diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js
index 491553fb24..d798524f3e 100644
--- a/src/controllers/uploads.js
+++ b/src/controllers/uploads.js
@@ -93,7 +93,11 @@ uploadsController.uploadThumb = function(req, res, next) {
 };
 
 uploadsController.uploadGroupCover = function(data, next) {
-	uploadImage(0/*req.user.uid*/, data, next);
+	uploadImage(0, data, next);
+};
+
+uploadsController.uploadUserCover = function(data, next) {
+	uploadImage(data.uid, data, next);
 };
 
 function uploadImage(uid, image, callback) {
diff --git a/src/routes/api.js b/src/routes/api.js
index 402bf85341..32d764f5de 100644
--- a/src/routes/api.js
+++ b/src/routes/api.js
@@ -28,7 +28,8 @@ module.exports =  function(app, middleware, controllers) {
 	router.post('/post/upload', middlewares, uploadsController.uploadPost);
 	router.post('/topic/thumb/upload', middlewares, uploadsController.uploadThumb);
 	router.post('/user/:userslug/uploadpicture', middlewares.concat([middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions]), controllers.accounts.edit.uploadPicture);
-
+	
+	router.post('/user/uploadcover', middlewares.concat([middleware.authenticate, middleware.checkGlobalPrivacySettings, middleware.checkAccountPermissions]), controllers.accounts.edit.uploadCoverPicture);
 	router.post('/groups/uploadpicture', middlewares.concat([middleware.authenticate]), controllers.groups.uploadCover);
 };
 
diff --git a/src/socket.io/user/profile.js b/src/socket.io/user/profile.js
index 4e0be0acc5..4eccfbcfe5 100644
--- a/src/socket.io/user/profile.js
+++ b/src/socket.io/user/profile.js
@@ -23,6 +23,20 @@ module.exports = function(SocketUser) {
 		], callback);
 	};
 
+	SocketUser.updateCover = function(socket, data, callback) {
+		if (!socket.uid) {
+			return callback(new Error('[[error:no-privileges]]'));
+		}
+
+		user.isAdministrator(socket.uid, function(err, isAdmin) {
+			if (!isAdmin && data.uid !== socket.uid) {
+				return callback(new Error('[[error:no-privileges]]'));
+			}
+
+			user.updateCoverPicture(data, callback);
+		});
+	};
+
 	function isAdminOrSelfAndPasswordMatch(uid, data, callback) {
 		async.parallel({
 			isAdmin: async.apply(user.isAdministrator, uid),
diff --git a/src/user/picture.js b/src/user/picture.js
index cf89f34399..20bb9647ef 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -4,10 +4,12 @@ var async = require('async'),
 	path = require('path'),
 	fs = require('fs'),
 	nconf = require('nconf'),
+	crypto = require('crypto'),
 	winston = require('winston'),
 	request = require('request'),
 	mime = require('mime'),
 
+	uploadsController = require('../controllers/uploads'),
 	plugins = require('../plugins'),
 	file = require('../file'),
 	image = require('../image'),
@@ -51,7 +53,7 @@ module.exports = function(User) {
 					next();
 				}
 			}
-		], function(err, result) {
+		], function(err) {
 			function done(err, image) {
 				if (err) {
 					return callback(err);
@@ -99,7 +101,7 @@ module.exports = function(User) {
 			return callback(new Error('[[error:no-plugin]]'));
 		}
 
-		request.head(url, function(err, res, body) {
+		request.head(url, function(err, res) {
 			if (err) {
 				return callback(err);
 			}
@@ -126,4 +128,74 @@ module.exports = function(User) {
 			});
 		});
 	};
+
+	User.updateCoverPosition = function(uid, position, callback) {
+		User.setUserField(uid, 'cover:position', position, callback);
+	};
+
+	User.updateCoverPicture = function(data, callback) {
+		var tempPath, url, md5sum;
+
+		if (!data.imageData && data.position) {
+			return User.updateCoverPosition(data.uid, data.position, callback);
+		}
+
+		async.series([
+			function(next) {
+				if (data.file) {
+					return next();
+				}
+
+				md5sum = crypto.createHash('md5');
+				md5sum.update(data.imageData);
+				md5sum = md5sum.digest('hex');
+				next();
+			},
+			function(next) {
+				if (data.file) {
+					return next();
+				}
+
+				tempPath = path.join(nconf.get('base_dir'), nconf.get('upload_path'), md5sum);
+				var buffer = new Buffer(data.imageData.slice(data.imageData.indexOf('base64') + 7), 'base64');
+
+				fs.writeFile(tempPath, buffer, {
+					encoding: 'base64'
+				}, next);
+			},
+			function(next) {
+				uploadsController.uploadUserCover({
+					name: 'profileCover',
+					path: data.file ? data.file : tempPath,
+					uid: data.uid
+				}, function(err, uploadData) {
+					if (err) {
+						return next(err);
+					}
+
+					url = uploadData.url;
+					next();
+				});
+			},
+			function(next) {
+				User.setUserField(data.uid, 'cover:url', url, next);
+			},
+			function(next) {
+				require('fs').unlink(data.file ? data.file : tempPath, next);
+			}
+		], function(err) {
+			if (err) {
+				return callback(err);
+			}
+
+			if (data.position) {
+				User.updateCoverPosition(data.uid, data.position, function(err) {
+					callback(err, {url: url});
+				});
+			} else {
+				callback(err, {url: url});
+			}
+		});
+	};
+
 };
\ No newline at end of file

From 1c63befdf07c62209db201d2aad1ec845bab982d Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 17:43:29 -0400
Subject: [PATCH 19/25] up'd persona

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

diff --git a/package.json b/package.json
index 25a0b46228..0d00088257 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
     "nodebb-theme-lavender": "2.0.11",
-    "nodebb-theme-persona": "3.0.66",
+    "nodebb-theme-persona": "3.0.67",
     "nodebb-theme-vanilla": "4.0.30",
     "nodebb-widget-essentials": "2.0.3",
     "npm": "^2.1.4",

From f611e8bc451f66390e966123266a526642e5b3d6 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 17:47:23 -0400
Subject: [PATCH 20/25] latest vanilla

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

diff --git a/package.json b/package.json
index 0d00088257..d4cb1c0bd3 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
     "nodebb-rewards-essentials": "0.0.5",
     "nodebb-theme-lavender": "2.0.11",
     "nodebb-theme-persona": "3.0.67",
-    "nodebb-theme-vanilla": "4.0.30",
+    "nodebb-theme-vanilla": "4.0.31",
     "nodebb-widget-essentials": "2.0.3",
     "npm": "^2.1.4",
     "passport": "^0.3.0",

From a5b754eac3125b0ffb8a511512f113a00410031a Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 18:02:49 -0400
Subject: [PATCH 21/25] add profile cover/position + profile picture on every
 account page

---
 src/controllers/accounts/helpers.js | 7 ++++++-
 src/controllers/accounts/profile.js | 3 ---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index 9a881ddab5..63a25a992a 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -3,6 +3,7 @@
 
 var async = require('async'),
 	validator = require('validator'),
+	nconf = require('nconf'),
 
 	user = require('../../user'),
 	groups = require('../../groups'),
@@ -118,7 +119,7 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
 
 			async.parallel({
 				user: function(next) {
-					user.getUserFields(uid, ['uid', 'username', 'userslug'], next);
+					user.getUserFields(uid, ['uid', 'username', 'userslug', 'picture', 'cover:url', 'cover:position'], next);
 				},
 				isAdmin: function(next) {
 					user.isAdministrator(callerUID, next);
@@ -138,6 +139,10 @@ helpers.getBaseUser = function(userslug, callerUID, callback) {
 			results.user.isSelf = parseInt(callerUID, 10) === parseInt(results.user.uid, 10);
 			results.user.showHidden = results.user.isSelf || results.isAdmin;
 			results.user.profile_links = results.profile_links;
+
+			results['cover:url'] = results['cover:url'] || nconf.get('relative_path') + '/images/cover-default.png';
+			results['cover:position'] = results['cover:position'] || '50% 50%';
+
 			next(null, results.user);
 		}
 	], callback);
diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js
index 5d06a62b3e..e55ee0d157 100644
--- a/src/controllers/accounts/profile.js
+++ b/src/controllers/accounts/profile.js
@@ -76,9 +76,6 @@ profileController.get = function(req, res, callback) {
 				userData.profileviews = 1;
 			}
 
-			userData['cover:url'] = userData['cover:url'] || nconf.get('relative_path') + '/images/cover-default.png';
-			userData['cover:position'] = userData['cover:position'] || '50% 50%';
-
 			plugins.fireHook('filter:user.account', {userData: userData, uid: req.uid}, next);
 		}
 	], function(err, results) {

From 36c020769a068ff67bae399af253a48855234658 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 18:10:13 -0400
Subject: [PATCH 22/25] latest themes

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

diff --git a/package.json b/package.json
index d4cb1c0bd3..167a504abf 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,8 @@
     "nodebb-plugin-spam-be-gone": "0.4.2",
     "nodebb-rewards-essentials": "0.0.5",
     "nodebb-theme-lavender": "2.0.11",
-    "nodebb-theme-persona": "3.0.67",
-    "nodebb-theme-vanilla": "4.0.31",
+    "nodebb-theme-persona": "3.0.68",
+    "nodebb-theme-vanilla": "4.0.32",
     "nodebb-widget-essentials": "2.0.3",
     "npm": "^2.1.4",
     "passport": "^0.3.0",

From ee71f982b7dc4b69e1c49cf424ae52479177aae6 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Wed, 28 Oct 2015 20:13:18 -0400
Subject: [PATCH 23/25] added missing filter:post.tools

---
 src/socket.io/posts/tools.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/socket.io/posts/tools.js b/src/socket.io/posts/tools.js
index d05c2b74be..5830820cb6 100644
--- a/src/socket.io/posts/tools.js
+++ b/src/socket.io/posts/tools.js
@@ -7,14 +7,14 @@ var events = require('../../events');
 var websockets = require('../index');
 var socketTopics = require('../topics');
 var privileges = require('../../privileges');
+var plugins = require('../../plugins');
 var favourites = require('../../favourites');
 
-
 module.exports = function(SocketPosts) {
 
 	SocketPosts.loadPostTools = function(socket, data, callback) {
 		if (!data) {
-			return callback(new Error('[[error:invalid-data]]'))
+			return callback(new Error('[[error:invalid-data]]'));
 		}
 
 		async.parallel({
@@ -26,12 +26,15 @@ module.exports = function(SocketPosts) {
 			},
 			favourited: function(next) {
 				favourites.getFavouritesByPostIDs([data.pid], socket.uid, next);
+			},
+			tools: function(next) {
+				plugins.fireHook('filter:post.tools', {pid: data.pid, uid: socket.uid, tools: []}, next);
 			}
 		}, function(err, results) {
 			if (err) {
 				return callback(err);
 			}
-			results.posts.tools = []; // TODO: add filter for this
+			results.posts.tools = results.tools.tools;
 			results.posts.deleted = parseInt(results.posts.deleted, 10) === 1;
 			results.posts.favourited = results.favourited[0];
 			results.posts.selfPost = socket.uid && socket.uid === parseInt(results.posts.uid, 10);

From 07c50cba7d2e7375711a3688aa49efac345701a3 Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Wed, 28 Oct 2015 20:35:56 -0400
Subject: [PATCH 24/25] titles for ACP routes

---
 src/middleware/admin.js    | 10 ++++++++--
 src/views/admin/header.tpl |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/middleware/admin.js b/src/middleware/admin.js
index 0dd81dc8fe..27c58bed83 100644
--- a/src/middleware/admin.js
+++ b/src/middleware/admin.js
@@ -4,7 +4,6 @@ var app,
 	middleware = {},
 	nconf = require('nconf'),
 	async = require('async'),
-	path = require('path'),
 	winston = require('winston'),
 	user = require('../user'),
 	meta = require('../meta'),
@@ -95,6 +94,12 @@ middleware.renderHeader = function(req, res, data, next) {
 			}
 			res.locals.config = results.config;
 
+			var acpPath = req.path.slice(1).split('/');
+			acpPath.forEach(function(path, i) {
+				acpPath[i] = path.charAt(0).toUpperCase() + path.slice(1);
+			});
+			acpPath = acpPath.join(' > ');
+
 			var templateValues = {
 				config: results.config,
 				configJSON: JSON.stringify(results.config),
@@ -106,7 +111,8 @@ middleware.renderHeader = function(req, res, data, next) {
 				authentication: results.custom_header.authentication,
 				scripts: results.scripts,
 				'cache-buster': meta.config['cache-buster'] ? 'v=' + meta.config['cache-buster'] : '',
-				env: process.env.NODE_ENV ? true : false
+				env: process.env.NODE_ENV ? true : false,
+				title: acpPath + ' | NodeBB Admin Control Panel'
 			};
 
 			templateValues.template = {name: res.locals.template};
diff --git a/src/views/admin/header.tpl b/src/views/admin/header.tpl
index c2828dfbd9..9ac8762a5e 100644
--- a/src/views/admin/header.tpl
+++ b/src/views/admin/header.tpl
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-	<title>NodeBB Admin Control Panel</title>
+	<title>{title}</title>
 	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 
 	<link rel="stylesheet" href="{relative_path}/vendor/jquery/css/smoothness/jquery-ui-1.10.4.custom.min.css?{cache-buster}">

From 098111ba5b9ef820b900bc3c6912deed0ca2f9ec Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Thu, 29 Oct 2015 11:45:28 -0400
Subject: [PATCH 25/25] Fixes bug where if post edit was called without a
 title, NodeBB would crash

---
 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 2eca8a8328..ea7686fb20 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -86,7 +86,7 @@ module.exports = function(Posts) {
 
 	function editMainPost(data, postData, callback) {
 		var tid = postData.tid;
-		var title = data.title.trim();
+		var title = data.title ? data.title.trim() : '';
 
 		async.parallel({
 			topic: function(next) {