From cc1f6683080070fe4965c31a9251435eddc495d0 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 28 Aug 2013 22:08:46 -0400
Subject: [PATCH 01/20] changed chat online offline messages

---
 public/src/forum/account.js |  12 ++--
 public/src/forum/footer.js  |  23 +++-----
 public/src/forum/topic.js   |  10 +++-
 public/src/modules/chat.js  | 115 ++++++++++++++++++++++--------------
 public/templates/footer.tpl |   2 +-
 src/websockets.js           |  39 +-----------
 6 files changed, 98 insertions(+), 103 deletions(-)

diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index aba3eb33a1..5818cae7b1 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -54,17 +54,19 @@
 		
 		var onlineStatus = $('.account-online-status');
 		
-		socket.on('api:user.isOnline', function(online) {
-			if(online) {
+		function handleUserOnline(data) {
+			if(data.online) {
 				onlineStatus.find('span span').text('online');
 				onlineStatus.find('i').attr('class', 'icon-circle');
 			} else {
 				onlineStatus.find('span span').text('offline');
 				onlineStatus.find('i').attr('class', 'icon-circle-blank');
 			}
-		});
-		
-		socket.emit('api:user.isOnline', theirid);
+		}
+
+		socket.on('api:user.isOnline', handleUserOnline);
+
+		socket.emit('api:user.isOnline', theirid, handleUserOnline);
 
 	});
 
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index c892b300eb..4a1b52fdd5 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -162,25 +162,18 @@
 	socket.on('chatMessage', function(data) {
 
 		require(['chat'], function(chat) {
-			var chatModal = chat.createModalIfDoesntExist(data.username, data.fromuid, function(created, modal) {
-				if(!created)
-					chat.appendChatMessage(modal, data.message, data.timestamp);
-			});
+			var modal = null;
+			if(chat.modalExists(data.fromuid)) {
+				modal = chat.getModal(data.fromuid);
+				chat.appendChatMessage(modal, data.message, data.timestamp);
+			} else {
+				modal = chat.createModal(data.username, data.fromuid);				
+			}
 
-			chatModal.show();
-			chat.bringModalToTop(chatModal);
+			chat.load(modal.attr('UUID'));
 		});
 	});
 
-	socket.on('chatGoOffline', function(data) {
-		require(['chat'], function(chat) {
-			if(chat.modalOpen(data.uid)) {
-				var modal = chat.getModal(data.uid);
-				chat.appendChatMessage(modal, data.username + ' went offline\n', data.timestamp);
-			}
-		});
-	})
-
 	require(['mobileMenu'], function(mobileMenu) {
 		mobileMenu.init();
 	});
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 500cab3e84..8f07b2cac3 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -288,9 +288,13 @@
 			return;
 
 		require(['chat'], function(chat) {
-			var chatModal = chat.createModalIfDoesntExist(username, touid);
-			chatModal.modal();
-			chat.bringModalToTop(chatModal); // I don't think this is necessary
+			var chatModal;
+			if(!chat.modalExists(touid)) {
+				chatModal = chat.createModal(username, touid);
+			} else {
+				chatModal = chat.getModal(touid);
+			}
+			chat.load(chatModal.attr('UUID'));
 		});
 	});
 
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 704bf16b5a..3c67a6e170 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -17,46 +17,74 @@ define(['taskbar'], function(taskbar) {
 		return $('#chat-modal-' + touid);
 	}
 
-	module.modalOpen = function(touid) {
+	module.modalExists = function(touid) {
 		return $('#chat-modal-' + touid).length !== 0;
 	}
-	module.createModalIfDoesntExist = function(username, touid, callback) {
-		var chatModal = $('#chat-modal-' + touid);
-
-		if(!chatModal.length) {
-			var chatModal = $('#chat-modal').clone();
-			chatModal.attr('id','chat-modal-' + touid);
-			var uuid = utils.generateUUID();
-			chatModal.attr('UUID', uuid);
-			chatModal.appendTo($('body'));
-			chatModal.draggable({
-				start:function(){
-					module.bringModalToTop(chatModal);
+	
+	function checkStatus(chatModal, callback) {
+		socket.emit('api:user.isOnline', chatModal.touid, function(data) {
+			if(data.online !== chatModal.online) {
+				if(data.online) {
+					module.appendChatMessage(chatModal, chatModal.username + ' has come online.\n', data.timestamp);
+				} else {
+					module.appendChatMessage(chatModal, chatModal.username + ' has gone offline.\n', data.timestamp);
 				}
-			});
-			chatModal.find('#chat-with-name').html(username);
-
-			chatModal.find('.close').on('click', function(e) {
-				chatModal.hide();
-				taskbar.discard('chat', uuid);
-			});
-
-			chatModal.on('click', function(e) {
+				chatModal.online = data.online;
+			}
+			if(callback)
+				callback(data.online);
+		});
+	}
+	
+	function checkOnlineStatus(chatModal) {
+		if(chatModal.intervalId === 0) {
+			chatModal.intervalId = setInterval(function(){
+				checkStatus(chatModal);
+			}, 1000);
+		}
+	}
+	
+	module.createModal = function(username, touid, callback) {
+			
+		var chatModal = $('#chat-modal').clone(),
+			uuid = utils.generateUUID();
+			
+		chatModal.intervalId = 0;
+		chatModal.touid = touid;
+		chatModal.username = username;
+
+		chatModal.attr('id', 'chat-modal-' + touid);
+		chatModal.attr('UUID', uuid);
+		chatModal.appendTo($('body'));
+		chatModal.draggable({
+			start:function() {
 				module.bringModalToTop(chatModal);
-			});
-
-			addSendHandler(chatModal, touid);
-
-			getChatMessages(chatModal, touid, callback);
+			}
+		});
+		
+		chatModal.find('#chat-with-name').html(username);
+
+		chatModal.find('.close').on('click', function(e) {
+			clearInterval(chatModal.intervalId);
+			chatModal.intervalId = 0;
+			chatModal.hide();
+			taskbar.discard('chat', uuid);
+		});
 
-			taskbar.push('chat', chatModal.attr('UUID'), {title:'chat with '+username});
-			return chatModal;
-		}
+		chatModal.on('click', function(e) {
+			module.bringModalToTop(chatModal);
+		});
+		
+		addSendHandler(chatModal);
 
-		if(callback)
-			callback(false, chatModal);
+		checkStatus(chatModal, function(online) {
+			chatModal.online = online;
+			getChatMessages(chatModal, function() {
+				checkOnlineStatus(chatModal);
+			});
+		});
 
-		taskbar.push('chat', chatModal.attr('UUID'), {title:'chat with '+username});
+		taskbar.push('chat', chatModal.attr('UUID'), {title:'chat with ' + username});
 		return chatModal;
 	}
 
@@ -64,45 +92,46 @@ define(['taskbar'], function(taskbar) {
 		var chatModal = $('div[UUID="'+uuid+'"]');
 		chatModal.show();
 		module.bringModalToTop(chatModal);
+		checkOnlineStatus(chatModal);
 	}
 
 	module.minimize = function(uuid) {
 		var chatModal = $('div[UUID="'+uuid+'"]');
 		chatModal.hide();
 		taskbar.minimize('chat', uuid);
+		clearInterval(chatModal.intervalId);
+		chatModal.intervalId = 0;
 	}
 
-	function getChatMessages(chatModal, touid, callback) {
-		socket.emit('getChatMessages', {touid:touid}, function(messages) {
+	function getChatMessages(chatModal, callback) {
+		socket.emit('getChatMessages', {touid:chatModal.touid}, function(messages) {
 			for(var i = 0; i<messages.length; ++i) {
 				module.appendChatMessage(chatModal, messages[i].content, messages[i].timestamp);
 			}
-
-			if(callback)
-				callback(true, chatModal);
+			callback();
 		});
 	}
 
-	function addSendHandler(chatModal, touid) {
+	function addSendHandler(chatModal) {
 		chatModal.find('#chat-message-input').off('keypress');
 		chatModal.find('#chat-message-input').on('keypress', function(e) {
 			if(e.which === 13) {
-				sendMessage(chatModal, touid);
+				sendMessage(chatModal);
 			}
 		});
 
 		chatModal.find('#chat-message-send-btn').off('click');
 		chatModal.find('#chat-message-send-btn').on('click', function(e){
-			sendMessage(chatModal, touid);
+			sendMessage(chatModal);
 			return false;
 		});
 	}
 
-	function sendMessage(chatModal, touid) {
+	function sendMessage(chatModal) {
 		var msg = app.strip_tags(chatModal.find('#chat-message-input').val());
 		if(msg.length) {
 			msg = msg +'\n';
-			socket.emit('sendChatMessage', { touid:touid, message:msg});
+			socket.emit('sendChatMessage', { touid:chatModal.touid, message:msg});
 			chatModal.find('#chat-message-input').val('');
 		}
 	}
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index 11b04261b9..85e9938b84 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -18,7 +18,7 @@
 		</div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
 
-	<div id="chat-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
+	<div id="chat-modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 				<div class="modal-header">
diff --git a/src/websockets.js b/src/websockets.js
index f75eeda2a0..39f47ffa4d 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -32,8 +32,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 (function(io) {
 	var	users = {},
 		userSockets = {},
-		rooms = {},
-		chats = {};
+		rooms = {};
 
 	global.io = io;
 
@@ -57,13 +56,6 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 
 					user.getUserField(uid, 'username', function(err, username) {
 						socket.emit('event:connect', {status: 1, username:username, uid:uid});
-
-						if(chats[uid]) {
-							for(var i=0; i<chats[uid].length; ++i) {
-								io.sockets.in(chats[uid][i]).emit('chatMessage', {fromuid:uid, username:username, message: username+' came online\n', timestamp: Date.now()});
-								socket.join(chats[uid][i]);
-							}
-						}
 					});
 				}
 			});
@@ -82,18 +74,6 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 				delete users[sessionID];
 				if(uid) {
 					io.sockets.in('global').emit('api:user.isOnline', isUserOnline(uid));
-
-					user.getUserField(uid, 'username', function(err, username) {
-
-						if(chats[uid] && chats[uid].length) {
-
-							for(var i=0; i<chats[uid].length; ++i) {
-
-								io.sockets.in(chats[uid][i]).emit('chatGoOffline', {uid:uid, username:username, timestamp:Date.now()});
-								socket.leave(chats[uid][i]);
-							}
-						}
-					});
 				}
 			}
 
@@ -269,8 +249,8 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			socket.emit('api:user.get_online_users', returnData);
 		});
 
-		socket.on('api:user.isOnline', function(uid) {
-			socket.emit('api:user.isOnline', isUserOnline(uid));
+		socket.on('api:user.isOnline', function(uid, callback) {
+			callback({online:isUserOnline(uid), timestamp:Date.now()});
 		});
 
 		socket.on('api:user.changePassword', function(data, callback) {
@@ -548,9 +528,6 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 
 			var msg = utils.strip_tags(data.message);
 
-			var uids = [uid, touid].sort();
-			var chatroom = 'chatroom_'+uids[0]+'_'+uids[1];
-
 			user.getUserField(uid, 'username', function(err, username) {
 				var finalMessage = username + ': ' + msg,
 					notifText = 'New message from <strong>' + username + '</strong>';
@@ -570,13 +547,8 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 						numSockets = userSockets[touid].length;
 
 						for(var x=0; x<numSockets; ++x) {
-							userSockets[touid][x].join(chatroom);
 							userSockets[touid][x].emit('chatMessage', {fromuid:uid, username:username, message: finalMessage, timestamp: Date.now()});
 						}
-
-						chats[touid] = chats[touid] || [];
-						if(chats[touid].indexOf(chatroom) === -1)
-							chats[touid].push(chatroom);
 					}
 
 					if(userSockets[uid]) {
@@ -584,13 +556,8 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 						numSockets = userSockets[uid].length;
 
 						for(var x=0; x<numSockets; ++x) {
-							userSockets[uid][x].join(chatroom);
 							userSockets[uid][x].emit('chatMessage', {fromuid:touid, username:username, message:'You : ' + msg, timestamp: Date.now()});
 						}
-
-						chats[uid] = chats[uid] || [];
-						if(chats[uid].indexOf(chatroom) === -1)
-							chats[uid].push(chatroom);
 					}
 				});
 			});

From 41defbcf9c98ef87c8d2cbdc3c9aef0f7a0ac400 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 29 Aug 2013 11:41:27 -0400
Subject: [PATCH 02/20] added delays to home page animations

---
 public/css/home.less | 74 +++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/public/css/home.less b/public/css/home.less
index 4ebc7335bf..47b90048cb 100644
--- a/public/css/home.less
+++ b/public/css/home.less
@@ -101,69 +101,87 @@
 
 @-webkit-keyframes scroll-2 /* Safari and Chrome */
 {
-    0%   {top: 0px;}
-    25%   {top: -90px;}
-    50%  {top: -180px;}
-    75%  {top: -270px;}
+    0% {top: 0px;}
+    3% {top:-90px;}
+    25% {top: -90px;}
+    28% {top:-180px;}
+    50% {top: -180px;}
+    53% {top: -270px;};
+    75% {top: -270px;}
+    78% {top: -360px;}
     100% {top: -360px;}
 }
 
 @keyframes scroll-2
 {
-    0%   {top: 0px;}
-    25%   {top: -90px;}
-    50%  {top: -180px;}
-    75%  {top: -270px;}
+    0% {top: 0px;}
+    3% {top:-90px;}
+    25% {top: -90px;}
+    28% {top:-180px;}
+    50% {top: -180px;}
+    53% {top: -270px;};
+    75% {top: -270px;}
+    78% {top: -360px;}
     100% {top: -360px;}
 }
 
 @-webkit-keyframes scroll-1 /* Safari and Chrome */
 {
-    0%   {top: 0px;}
-    33%   {top: -90px;}
-    66%  {top: -180px;}
-    100%  {top: -270px;}
+    0% {top: 0px;}
+    3% {top:-90px;}
+    33% {top: -90px;}
+    36% {top: -180px;}
+    66% {top: -180px;}
+    69% {top: -270px;}
+    100% {top: -270px;}
 }
 
 @keyframes scroll-1
 {
-    0%   {top: 0px;}
-    33%   {top: -90px;}
-    66%  {top: -180px;}
-    100%  {top: -270px;}
+    0% {top: 0px;}
+    3% {top:-90px;}
+    33% {top: -90px;}
+    36% {top: -180px;}
+    66% {top: -180px;}
+    69% {top: -270px;}
+    100% {top: -270px;}
 }
 
 @-webkit-keyframes scroll-0 /* Safari and Chrome */
 {
-    0%   {top: 0px;}
-    50%   {top: -90px;}
-    100%  {top: -180px;}
+    0% {top: 0px;}
+    3% {top:-90px;}
+    50% {top: -90px;}
+    53% {top: -180px;}
+    100% {top: -180px;}
 }
 
 @keyframes scroll-0
 {
-    0%   {top: 0px;}
-    50%   {top: -90px;}
-    100%  {top: -180px;}
+    0% {top: 0px;}
+    3% {top:-90px;}
+    50% {top: -90px;}
+    53% {top: -180px;}
+    100% {top: -180px;}
 }
 
 .category-slider-2:hover {
   position:relative;
 
-  -webkit-animation: scroll-2 10s ease 0.5s infinite normal;
-  animation: scroll-2 10s ease 0.5s infinite normal;/* Safari and Chrome: */
+  -webkit-animation: scroll-2 10s ease-in 0.5s infinite normal;
+  animation: scroll-2 10s ease-in 0.5s infinite normal;/* Safari and Chrome: */
 }
 
 .category-slider-1:hover {
   position:relative;
 
-  -webkit-animation: scroll-1 8s ease 0.5s infinite normal;
-  animation: scroll-1 8s ease 0.5s infinite normal;/* Safari and Chrome: */
+  -webkit-animation: scroll-1 8s ease-in 0.5s infinite normal;
+  animation: scroll-1 8s ease-in 0.5s infinite normal;/* Safari and Chrome: */
 }
 
 .category-slider-0:hover {
   position:relative;
 
-  -webkit-animation: scroll-0 6s ease 0.5s infinite normal;
-  animation: scroll-0 6s ease 0.5s infinite normal;/* Safari and Chrome: */
+  -webkit-animation: scroll-0 6s ease-in 0.5s infinite normal;
+  animation: scroll-0 6s ease-in 0.5s infinite normal;/* Safari and Chrome: */
 }

From 1b33b4425b6d3a39ff57ef789033152be041b5f6 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 29 Aug 2013 11:49:53 -0400
Subject: [PATCH 03/20] removed active from pill, #issue 231

---
 public/templates/users.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/templates/users.tpl b/public/templates/users.tpl
index 43d421a21b..ff6f2aaa72 100644
--- a/public/templates/users.tpl
+++ b/public/templates/users.tpl
@@ -1,7 +1,7 @@
 <div>
 
 	<ul class="nav nav-pills">
-		<li class='active'><a href='/users-latest'>Latest Users</a></li>
+		<li class=''><a href='/users-latest'>Latest Users</a></li>
 		<li class=''><a href='/users-sort-posts'>Top Posters</a></li>
 		<li class=''><a href='/users-sort-reputation'>Most Reputation</a></li>
 		<li class=''><a href='/users-search'>Search</a></li>

From 691b6611d0cc078dee152c28b7b2d0d37ff6e2de Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 29 Aug 2013 13:40:04 -0400
Subject: [PATCH 04/20] user search uses reds now

---
 src/user.js      | 46 +++++++++++++++++++++++++++++++++-------------
 src/webserver.js | 12 +++++++++---
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/src/user.js b/src/user.js
index 5f84b492fb..d087cd4102 100644
--- a/src/user.js
+++ b/src/user.js
@@ -7,7 +7,8 @@ var utils = require('./../public/src/utils.js'),
 	bcrypt = require('bcrypt'),
 	notifications = require('./notifications.js'),
 	topics = require('./topics.js'),
-	async = require('async');
+	async = require('async'),
+	userSearch = require('reds').createSearch('nodebbusersearch');
 
 (function(User) {
 	User.create = function(username, password, email, callback) {
@@ -90,6 +91,8 @@ var utils = require('./../public/src/utils.js'),
 				RDB.zadd('users:postcount', 0, uid);
 				RDB.zadd('users:reputation', 0, uid);
 
+				userSearch.index(username, uid);
+
 				io.sockets.emit('user.latest', {userslug: userslug, username: username});
 
 				if (password !== undefined) {
@@ -385,25 +388,42 @@ var utils = require('./../public/src/utils.js'),
 		});
 	}
 
+	User.reIndexAll = function(callback) {
+		User.getUsers('users:joindate', 0, -1, function(err, usersData) {
+			if(err) {
+				return callback(err, null);
+			}
+
+			function reIndexUser(uid, username) {
+				userSearch.remove(uid, function(){
+					userSearch.index(username, uid);
+				})
+			}
+
+			for(var i=0; i<usersData.length; ++i) {
+				reIndexUser(usersData[i].uid, usersData[i].username);
+			}
+			callback(null, 1);
+		});
+	}
+
 	User.search = function(username, callback) {
 		if(!username) {
 			callback([]);
 			return;
 		}
 
-		RDB.keys('username:*'+ username + '*:uid', function(err, keys) {
-			if(!err) {
-				if(keys && keys.length) {
-					RDB.mget(keys, function(err, uids) {
-						User.getDataForUsers(uids, function(userdata) {
-							callback(userdata);
-						});
-					});
-				} else {
-					callback([]);
-				}
-			} else {
+		userSearch.query(query = username).type('or').end(function(err, uids) {
+			if(err) {
 				console.log(err);
+				return;
+			}
+			if(uids && uids.length) {
+				User.getDataForUsers(uids, function(userdata) {
+					callback(userdata);
+				});
+			} else {
+				callback([]);
 			}
 		});
 	}
diff --git a/src/webserver.js b/src/webserver.js
index 79f9ca741c..68bb0b9127 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -403,10 +403,16 @@ var express = require('express'),
 		app.get('/reindex', function(req, res) {
 			topics.reIndexAll(function(err) {
 				if(err) {
-					res.json(err);
-				} else {
-					res.send('All topics reindexed');
+					return res.json(err);
 				}
+
+				user.reIndexAll(function(err) {
+					if(err) {
+						return res.json(err);
+					} else {
+						res.send('Topics and users reindexed');
+					}
+				});
 			});
 		});
 

From 54ba6efc930fac5de9d42438d0cdaa6cb68c70dd Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Thu, 29 Aug 2013 21:18:23 -0400
Subject: [PATCH 05/20] can edit and add an image to a post, still cant remove
 previously added images #issue #233

---
 public/src/forum/topic.js      | 12 ++++++++++++
 public/src/modules/composer.js |  3 ++-
 src/postTools.js               | 15 +++++++++++----
 src/posts.js                   |  6 +++---
 src/websockets.js              |  2 +-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 8f07b2cac3..3aa8ba5f68 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -383,6 +383,18 @@
 			this.innerHTML = data.content;
 			$(this).fadeIn(250);
 		});
+		
+		if(data.uploadedImages && data.uploadedImages.length) {
+			$('#images_'+data.pid).html('');
+			for(var i=0; i< data.uploadedImages.length; ++i) {
+				var img = $('<i class="icon-picture icon-1"></i><a href="' + data.uploadedImages[i].url +'"> '+data.uploadedImages[i].name+'</a><br/>');
+				$('#images_' + data.pid).append(img);
+			}
+		} else {
+			$('#images_'+data.pid).html('');
+		}
+		
+		console.log('time to recreate images', data);
 	});
 
 	socket.on('api:posts.favourite', function(data) {
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 1e9e46a885..d93b63f3da 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -8,7 +8,8 @@ define(['taskbar'], function(taskbar) {
 		};
 
 	function createImageLabel(img, postImages) {
-		var imageLabel = $('<div class="label label-primary"><span>'+ img.name +'</span></div>');
+//		var imageLabel = $('<div class="label label-primary"><span>'+ img.name +'</span></div>');
+		var imageLabel = $('<span class="label label-primary">' + img.name +'</span>');
 		var closeButton = $('<button class="close">&times;</button>');
 
 		closeButton.on('click', function(e) {
diff --git a/src/postTools.js b/src/postTools.js
index edef132e4c..8f0aaaf6d5 100644
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -55,7 +55,7 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-	PostTools.edit = function(uid, pid, title, content) {
+	PostTools.edit = function(uid, pid, title, content, images) {
 		var	success = function() {
 			posts.setPostField(pid, 'content', content);
 			posts.setPostField(pid, 'edited', Date.now());
@@ -66,6 +66,11 @@ var	RDB = require('./redis.js'),
 			});
 
 			async.parallel([
+				function(next) {
+					posts.uploadPostImages(pid, images, function(err, uploadedImages) {
+						next(err, uploadedImages);
+					});
+				},
 				function(next) {
 					posts.getPostField(pid, 'tid', function(tid) {
 						PostTools.isMain(pid, tid, function(isMainPost) {
@@ -76,7 +81,7 @@ var	RDB = require('./redis.js'),
 								});
 							}
 
-							next(null, tid);
+							next(null, {tid:tid, isMainPost:isMainPost});
 						});
 					});
 				},
@@ -84,10 +89,12 @@ var	RDB = require('./redis.js'),
 					PostTools.toHTML(content, next);
 				}
 			], function(err, results) {
-				io.sockets.in('topic_' + results[0]).emit('event:post_edited', {
+				io.sockets.in('topic_' + results[1].tid).emit('event:post_edited', {
 					pid: pid,
 					title: title,
-					content: results[1]
+					isMainPost: results[1].isMainPost,
+					content: results[2],
+					uploadedImages:results[0]
 				});
 			});
 		};
diff --git a/src/posts.js b/src/posts.js
index d292f86523..ccced14a70 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -332,7 +332,7 @@ var	RDB = require('./redis.js'),
 
 						async.parallel({
 							uploadedImages: function(next) {
-								uploadPostImages(postData, images, function(err, uploadedImages) {
+								Posts.uploadPostImages(postData.pid, images, function(err, uploadedImages) {
 									if(err) {
 										winston.error('Uploading images failed!', err.stack);
 										next(null, []);
@@ -350,7 +350,6 @@ var	RDB = require('./redis.js'),
 							}
 						}, function(err, results) {
 							postData.uploadedImages = results.uploadedImages;
-							Posts.setPostField(pid, 'uploadedImages', JSON.stringify(postData.uploadedImages));
 							postData.content = results.content;
 							callback(postData);
 						});
@@ -366,7 +365,7 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
-	function uploadPostImages(postData, images, callback) {
+	Posts.uploadPostImages = function(pid, images, callback) {
 		var imgur = require('./imgur');
 		imgur.setClientID(meta.config.imgurClientID);
 
@@ -394,6 +393,7 @@ var	RDB = require('./redis.js'),
 		} else {
 			async.each(images, uploadImage, function(err) {
 				if(!err) {
+					Posts.setPostField(pid, 'uploadedImages', JSON.stringify(uploadedImages));
 					callback(null, uploadedImages);
 				} else {
 					console.log(err);
diff --git a/src/websockets.js b/src/websockets.js
index 39f47ffa4d..f007ec127d 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -476,7 +476,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 				posts.emitContentTooShortAlert(socket);
 				return;
 			}
-			postTools.edit(uid, data.pid, data.title, data.content);
+			postTools.edit(uid, data.pid, data.title, data.content, data.images);
 		});
 
 		socket.on('api:posts.delete', function(data) {

From 106157a95128c7dd2c044b4c46bbbc5ab530ac7a Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Thu, 29 Aug 2013 21:19:35 -0400
Subject: [PATCH 06/20] removed commented out line

---
 public/src/modules/composer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index d93b63f3da..8d8f0cb7ca 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -8,7 +8,6 @@ define(['taskbar'], function(taskbar) {
 		};
 
 	function createImageLabel(img, postImages) {
-//		var imageLabel = $('<div class="label label-primary"><span>'+ img.name +'</span></div>');
 		var imageLabel = $('<span class="label label-primary">' + img.name +'</span>');
 		var closeButton = $('<button class="close">&times;</button>');
 

From 73d4152d1d31389cd089d72f34beea40566f4500 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Fri, 30 Aug 2013 11:07:44 -0400
Subject: [PATCH 07/20] updated readme to add nginx version requirement

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8ddc2cccc8..a957c41380 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,11 @@ Please support NodeBB development! Check out our IndieGoGo campaign and like, sh
 
 ## Requirements
 
-NodeBB requires a version of Node.js at least 0.8 or greater, and a Redis version 2.6 or greater.
+NodeBB requires the following software to be installed:
+
+* A version of Node.js at least 0.8 or greater
+* Redis, version 2.6 or greater.
+* nginx, version 1.3.13 or greater
 
 ## Installation
 

From 8a53c56a46620105e904e6cbaca43cd391fdd963 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 30 Aug 2013 11:18:15 -0400
Subject: [PATCH 08/20] updated install script to only populate "socket" object
 in client config with "address", which takes "use_port" into account.

This closes #234
---
 public/src/app.js | 2 +-
 src/install.js    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 11341a9c78..837764db53 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -15,7 +15,7 @@ var socket,
 				API_URL = data.api_url;
 
 				config = data;
-				socket = io.connect(config.socket.address + (config.socket.port ? ':' + config.socket.port : ''));
+				socket = io.connect(config.socket.address);
 
 				var reconnecting = false;
 				var reconnectTries = 0;
diff --git a/src/install.js b/src/install.js
index 6431b0a689..22275068bc 100644
--- a/src/install.js
+++ b/src/install.js
@@ -75,8 +75,7 @@ var	async = require('async'),
 					server_conf = config,
 					client_conf = {
 						socket: {
-							address: protocol + '//' + host,
-							port: config.port
+							address: protocol + '//' + host + (config.use_port ? ':' + config.port : '')
 						},
 						api_url: protocol + '//' + host + (config.use_port ? ':' + config.port : '') + relative_path + '/api/',
 						relative_path: relative_path

From d2eb73df96d3059c64d666ef76e7885b3d4ef8da Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 11:40:20 -0400
Subject: [PATCH 09/20] can add and remove images from posts

---
 public/src/modules/composer.js |  2 +-
 src/posts.js                   | 38 ++++++++++++++++++----------------
 src/websockets.js              | 14 ++++++++++---
 3 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 8d8f0cb7ca..8b34f063fe 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -152,7 +152,7 @@ define(['taskbar'], function(taskbar) {
 						pid: threadData.pid,
 						title: threadData.title || '',
 						body: threadData.body || '',
-						images: []
+						images: threadData.uploadedImages
 					};
 					composer.load(uuid);
 				} else {
diff --git a/src/posts.js b/src/posts.js
index ccced14a70..ac127bc57c 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -369,38 +369,40 @@ var	RDB = require('./redis.js'),
 		var imgur = require('./imgur');
 		imgur.setClientID(meta.config.imgurClientID);
 
-		var uploadedImages = [];
+		if(!images)
+			return callback(null, []);
+
+		var uploadedImages = images.filter(function(image) { return !!image.url; });
+
+		function uploadImage(image, next) {
+			if(!image.data)
+				return next(null);
 
-		function uploadImage(image, callback) {
 			imgur.upload(image.data, 'base64', function(err, data) {
 				if(err) {
-					callback(err);
+					next(err);
 				} else {
 					if(data.success) {
 						var img= {url:data.data.link, name:image.name};
 						uploadedImages.push(img);
-						callback(null);
+						next(null);
 					} else {
 						winston.error('Can\'t upload image, did you set imgurClientID?');
-						callback(data);
+						next(data);
 					}
 				}
 			});
 		}
 
-		if(!images) {
-			callback(null, uploadedImages);
-		} else {
-			async.each(images, uploadImage, function(err) {
-				if(!err) {
-					Posts.setPostField(pid, 'uploadedImages', JSON.stringify(uploadedImages));
-					callback(null, uploadedImages);
-				} else {
-					console.log(err);
-					callback(err, null);
-				}
-			});
-		}
+		async.each(images, uploadImage, function(err) {
+			if(!err) {
+				Posts.setPostField(pid, 'uploadedImages', JSON.stringify(uploadedImages));
+				callback(null, uploadedImages);
+			} else {
+				console.log(err);
+				callback(err, null);
+			}
+		});
 	}
 
 	Posts.getPostsByUid = function(uid, start, end, callback) {
diff --git a/src/websockets.js b/src/websockets.js
index f007ec127d..49adf7fd1f 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -583,7 +583,6 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			if (uid > 0) {
 				if (parseInt(data.tid) > 0) {
 					topics.getTopicData(data.tid, function(topicData) {
-
 						if (data.body)
 							topicData.body = data.body;
 
@@ -606,9 +605,17 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 						}
 					});
 				} else if (parseInt(data.pid) > 0) {
+
 					async.parallel([
 						function(next) {
-							posts.getPostField(data.pid, 'content', function(raw) {
+							posts.getPostFields(data.pid, ['content', 'uploadedImages'], function(raw) {
+								try {
+									raw.uploadedImages = JSON.parse(raw.uploadedImages);
+								} catch(e) {
+									winston.err(e);
+									raw.uploadedImages = [];
+								}
+
 								next(null, raw);
 							});
 						},
@@ -621,7 +628,8 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 						socket.emit('api:composer.push', {
 							title: results[1],
 							pid: data.pid,
-							body: results[0]
+							body: results[0].content,
+							uploadedImages: results[0].uploadedImages
 						});
 					});
 				}

From 167c1fa3480f270c29cbf68f4d9ab5944cd36f35 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Fri, 30 Aug 2013 11:43:46 -0400
Subject: [PATCH 10/20] fixing topic CSS so the h3 styles only apply to the
 topic title

---
 public/css/topic.less | 50 ++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/public/css/topic.less b/public/css/topic.less
index 0b80dc8ee8..b70772e9af 100644
--- a/public/css/topic.less
+++ b/public/css/topic.less
@@ -152,36 +152,38 @@
 	}
 
 	.main-post {
-		h3 {
-			margin: 0;
-
-			.topic-title {
-				width: auto;
-				overflow: hidden;
-				margin: 0 0 -5px 0;
-				padding: 0 0 5px 0
+		.main-post-buttons {
+			h3 {
+				margin: 0;
+
+				.topic-title {
+					width: auto;
+					overflow: hidden;
+					margin: 0 0 -5px 0;
+					padding: 0 0 5px 0
+				}
 			}
-		}
 
-		.main-avatar {
-			color: white;
-			position: relative;
-			float: left;
-			margin: 0 10px 0 0;
-			padding-bottom: 0px;
-			text-align: center;
-			width:100px;
+			.main-avatar {
+				color: white;
+				position: relative;
+				float: left;
+				margin: 0 10px 0 0;
+				padding-bottom: 0px;
+				text-align: center;
+				width:100px;
+
+				@media (max-width: 767px) {
+					display: none;
+				}
 
-			@media (max-width: 767px) {
-				display: none;
+				.img-thumbnail {
+					padding: 2px;
+					border-radius: 0;
+				}
 			}
 		}
 
-		.img-thumbnail {
-			padding: 2px;
-			border-radius: 0;
-		}
-
 		.post-content {
 			min-height: 80px;
 		}

From 22ababd87a3aa8c947f4f86ce4454054074e41f1 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 11:47:26 -0400
Subject: [PATCH 11/20] closes #240

---
 src/websockets.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/websockets.js b/src/websockets.js
index 49adf7fd1f..5bbcd049b4 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -343,7 +343,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 					socket.emit('event:alert', {
 						title: 'Thank you for posting',
 						message: 'You have successfully posted. Click here to view your post.',
-						type: 'warning',
+						type: 'success',
 						timeout: 2000
 					});
 				}
@@ -396,7 +396,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 					socket.emit('event:alert', {
 						title: 'Reply Successful',
 						message: 'You have successfully replied. Click here to view your reply.',
-						type: 'warning',
+						type: 'success',
 						timeout: 2000
 					});
 

From 2deb0e1708cd2b11ba61fc8c4ec9b2d8dea959a5 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 12:04:35 -0400
Subject: [PATCH 12/20] closes #238

---
 public/src/forum/account.js    |  9 ++++++---
 public/src/forum/followers.js  | 10 +++++-----
 public/src/forum/following.js  |  8 ++++----
 public/templates/account.tpl   |  4 ++--
 public/templates/following.tpl |  2 +-
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index 5818cae7b1..516d9196f3 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -6,7 +6,7 @@
 	$(document).ready(function() {
 
 		app.addCommasToNumbers();
-		
+
 		var followBtn = $('#follow-btn');
 		var unfollowBtn = $('#unfollow-btn');
 
@@ -18,6 +18,9 @@
 				followBtn.show();
 				unfollowBtn.hide();
 			}
+		} else {
+			followBtn.hide();
+			unfollowBtn.hide();
 		}
 
 		followBtn.on('click', function() {
@@ -51,9 +54,9 @@
 		$('.user-recent-posts .topic-row').on('click', function() {
 			ajaxify.go($(this).attr('topic-url'));
 		});
-		
+
 		var onlineStatus = $('.account-online-status');
-		
+
 		function handleUserOnline(data) {
 			if(data.online) {
 				onlineStatus.find('span span').text('online');
diff --git a/public/src/forum/followers.js b/public/src/forum/followers.js
index 5e4ec7a00d..9093dcbd1e 100644
--- a/public/src/forum/followers.js
+++ b/public/src/forum/followers.js
@@ -5,14 +5,14 @@
 		followersCount = templates.get('followersCount');
 
 	$(document).ready(function() {
-		
+
 		if(parseInt(followersCount, 10) === 0) {
-			$('#no-followers-notice').show();
+			$('#no-followers-notice').removeClass('hide');
 		}
-		
+
 		app.addCommasToNumbers();
-		
+
 	});
-	
+
 
 }());
\ No newline at end of file
diff --git a/public/src/forum/following.js b/public/src/forum/following.js
index 836fc274ca..0353b72236 100644
--- a/public/src/forum/following.js
+++ b/public/src/forum/following.js
@@ -5,9 +5,9 @@
 		followingCount = templates.get('followingCount');
 
 	$(document).ready(function() {
-		
+
 		if(parseInt(followingCount, 10) === 0) {
-			$('#no-following-notice').show();
+			$('#no-following-notice').removeClass('hide');
 		}
 
 
@@ -18,7 +18,7 @@
 			$('.unfollow-btn').on('click',function() {
 				var unfollowBtn = $(this);
 				var followingUid = $(this).attr('followingUid');
-			
+
 				socket.emit('api:user.unfollow', {uid: followingUid}, function(success) {
 					var username = unfollowBtn.attr('data-username');
 					if(success) {
@@ -34,6 +34,6 @@
 
 		app.addCommasToNumbers();
 	});
-	
+
 
 }());
\ No newline at end of file
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 16e87313c6..aa9bfd8ccb 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -19,8 +19,8 @@
 				<span class="label label-danger">banned</span>
 			</div>
 			<div id="user-actions">
-				<a id="follow-btn" href="#" class="btn hide">Follow</a>
-				<a id="unfollow-btn" href="#" class="btn hide">Unfollow</a>
+				<a id="follow-btn" href="#" class="btn btn-default">Follow</a>
+				<a id="unfollow-btn" href="#" class="btn btn-default">Unfollow</a>
 			</div>
 		</div>
 
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index c713b7a6a6..cbdc3d7911 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -25,7 +25,7 @@
 				<span class='formatted-number'>{following.postcount}</span>
 				<i class='icon-pencil'></i>
 			</div>
-			<a id="unfollow-btn" href="#" class="btn unfollow-btn" followingUid="{following.uid}" data-username="{following.username}">Unfollow</a>
+			<a id="unfollow-btn" href="#" class="btn btn-default unfollow-btn" followingUid="{following.uid}" data-username="{following.username}">Unfollow</a>
 		</div>
 		<!-- END following -->
 	</div>

From ad5e3ebce3cd5642c829688ee5e6e4a488b1c5c3 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 12:36:06 -0400
Subject: [PATCH 13/20] closes #236

---
 public/src/forum/topic.js  |  7 ++++---
 public/templates/topic.tpl | 35 ++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 3aa8ba5f68..5ff3091bb4 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -67,7 +67,8 @@
 				return false;
 			});
 
-			moveThreadModal.on('shown', function() {
+			moveThreadModal.on('shown.bs.modal', function() {
+
 				var loadingEl = document.getElementById('categories-loading');
 				if (loadingEl) {
 					socket.once('api:categories.get', function(data) {
@@ -383,7 +384,7 @@
 			this.innerHTML = data.content;
 			$(this).fadeIn(250);
 		});
-		
+
 		if(data.uploadedImages && data.uploadedImages.length) {
 			$('#images_'+data.pid).html('');
 			for(var i=0; i< data.uploadedImages.length; ++i) {
@@ -393,7 +394,7 @@
 		} else {
 			$('#images_'+data.pid).html('');
 		}
-		
+
 		console.log('time to recreate images', data);
 	});
 
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 27aabcd57d..7a3aa20b8e 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -170,23 +170,28 @@
 	</div>
 </div>
 
-<div id="move_thread_modal" class="modal hide fade">
-	<div class="modal-header">
-		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-		<h3>Move Thread</h3>
-	</div>
-	<div class="modal-body">
-		<p id="categories-loading"><i class="icon-spin icon-refresh"></i> Loading Categories</p>
-		<ul class="category-list"></ul>
-		<div id="move-confirm" style="display: none;">
-			<hr />
-			<div class="alert">This topic will be moved to the category <strong><span id="confirm-category-name"></span></strong></div>
+
+<div id="move_thread_modal" class="modal" tabindex="-1" role="dialog" aria-labelledby="Chat" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h3>Move Thread</h3>
+			</div>
+			<div class="modal-body">
+				<p id="categories-loading"><i class="icon-spin icon-refresh"></i> Loading Categories</p>
+				<ul class="category-list"></ul>
+				<div id="move-confirm" style="display: none;">
+					<hr />
+					<div class="alert">This topic will be moved to the category <strong><span id="confirm-category-name"></span></strong></div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-default" data-dismiss="modal" id="move_thread_cancel">Close</a>
+				<button type="button" class="btn btn-primary" id="move_thread_commit" disabled>Move</a>
+			</div>
 		</div>
 	</div>
-	<div class="modal-footer">
-		<button type="button" class="btn" data-dismiss="modal" id="move_thread_cancel">Close</a>
-		<button type="button" class="btn btn-primary" id="move_thread_commit" disabled>Move</a>
-	</div>
 </div>
 
 <input type="hidden" template-variable="expose_tools" value="{expose_tools}" />

From 7cff55a160ce9d05d1a430fb0ec0968826feb681 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 14:25:59 -0400
Subject: [PATCH 14/20] closes #209

---
 public/src/app.js         | 12 ++++++++++++
 public/src/forum/topic.js | 10 +---------
 src/websockets.js         |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/public/src/app.js b/public/src/app.js
index 837764db53..a462e53b6f 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -314,6 +314,18 @@ var socket,
 		});
 	}
 
+	app.openChat = function(username, touid) {
+		require(['chat'], function(chat) {
+			var chatModal;
+			if(!chat.modalExists(touid)) {
+				chatModal = chat.createModal(username, touid);
+			} else {
+				chatModal = chat.getModal(touid);
+			}
+			chat.load(chatModal.attr('UUID'));
+		});
+	}
+
 	app.createNewPosts = function(data) {
 		data.posts[0].display_moderator_tools = 'none';
 		var html = templates.prepare(templates['topic'].blocks['posts']).parse(data),
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 5ff3091bb4..752d703f87 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -288,15 +288,7 @@
 		if(username === app.username || !app.username)
 			return;
 
-		require(['chat'], function(chat) {
-			var chatModal;
-			if(!chat.modalExists(touid)) {
-				chatModal = chat.createModal(username, touid);
-			} else {
-				chatModal = chat.getModal(touid);
-			}
-			chat.load(chatModal.attr('UUID'));
-		});
+		app.openChat(username, touid);
 	});
 
 	ajaxify.register_events([
diff --git a/src/websockets.js b/src/websockets.js
index 5bbcd049b4..572843156b 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -533,7 +533,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 					notifText = 'New message from <strong>' + username + '</strong>';
 
 				if(!isUserOnline(touid)) {
-					notifications.create(notifText, 5, '#', 'notification_' + uid + '_' + touid, function(nid) {
+					notifications.create(notifText, 5, 'javascript:app.openChat(&apos;'+username+'&apos;, '+uid+');', 'notification_' + uid + '_' + touid, function(nid) {
 						notifications.push(nid, [touid], function(success) {
 
 						});

From 77359f7b83cb6fdf35f56e9567923879b5d49408 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 14:27:54 -0400
Subject: [PATCH 15/20] added space between user name and colon

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

diff --git a/src/websockets.js b/src/websockets.js
index 572843156b..3027bfbdf9 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -529,7 +529,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			var msg = utils.strip_tags(data.message);
 
 			user.getUserField(uid, 'username', function(err, username) {
-				var finalMessage = username + ': ' + msg,
+				var finalMessage = username + ' : ' + msg,
 					notifText = 'New message from <strong>' + username + '</strong>';
 
 				if(!isUserOnline(touid)) {

From 599789634a390363dd7443b8037ec682c4155625 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 14:47:31 -0400
Subject: [PATCH 16/20] closes #227

---
 src/categories.js | 2 ++
 src/webserver.js  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/src/categories.js b/src/categories.js
index dab6475543..b5a0938e5b 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -15,6 +15,7 @@ var	RDB = require('./redis.js'),
 
 			var category_name = categoryData.name,
 				category_slug = categoryData.slug,
+				disabled = categoryData.disabled || '0',
 				category_description = categoryData.description;
 
 			function getTopicIds(next) {
@@ -32,6 +33,7 @@ var	RDB = require('./redis.js'),
 				var categoryData = {
 					'category_name' : category_name,
 					'category_description': category_description,
+					'disabled': disabled,
 					'show_sidebar' : 'show',
 					'show_topic_button': 'inline-block',
 					'no_topics_message': 'hidden',
diff --git a/src/webserver.js b/src/webserver.js
index 68bb0b9127..4e072787b8 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -295,6 +295,11 @@ var express = require('express'),
 			async.waterfall([
 				function(next) {
 					categories.getCategoryById(cid, 0, function(err, categoryData) {
+
+						if(categoryData) {
+							if(categoryData.disabled === '1')
+								return next(new Error('Category disabled'), null);
+						}
 						next(err, categoryData);
 					});
 				},

From 2c238f49e0ef7cee303d0ab2f08cd38f9f9d7984 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Sat, 31 Aug 2013 02:59:45 +0800
Subject: [PATCH 17/20] added search button, hiding the form by default. also
 fixes issue #241

notes: mobile needs a dedicated notification screen, imo, rather than
using the same popup. and /search needs a form on the page itself.
---
 public/css/style.less       | 17 ++++++++++-------
 public/src/forum/footer.js  | 12 +++++++++++-
 public/templates/header.tpl | 28 +++++++++++++++++-----------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/public/css/style.less b/public/css/style.less
index d3697fdb95..63d77b030a 100644
--- a/public/css/style.less
+++ b/public/css/style.less
@@ -136,10 +136,6 @@ footer.footer {
 	}
 }
 
-#right-menu{
-	float:right;
-}
-
 #chat-content {
 	height:200px;
 	resize:none;
@@ -257,6 +253,11 @@ footer.footer {
 /* END: post-window needs to go in its own plugin area */
 
 
+//theme
+#search-form .btn-link {
+	color: white;
+}
+
 
 //START: FIXES FOR BS3, may need to remove these when we get out of the RC releases
 @media (max-width: 979px) {
@@ -266,9 +267,11 @@ footer.footer {
 	}
 }
 
-.container > .navbar-header, .container > .navbar-collapse {
-	padding-right: 0;
-	margin-right: -11px;
+@media (min-width: 760px) {
+	.container > .navbar-header, .container > .navbar-collapse {
+		padding-right: 0;
+		margin-right: -11px;
+	}
 }
 
 .badge {
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index 4a1b52fdd5..a67b349118 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -44,6 +44,16 @@
 
 	socket.on('api:updateHeader', function(data) {
 
+		jQuery('#search-button').on('click', function() {
+			jQuery('#search-fields').removeClass('hide').show();
+			jQuery(this).hide();
+			jQuery('#search-fields input').focus()
+
+			jQuery('#search-form').on('submit', function() {
+				jQuery('#search-fields').hide();
+				jQuery('#search-button').show();
+			});
+		});
 		var rightMenu = $('#right-menu'),
 			isLoggedIn = data.uid > 0;
 
@@ -167,7 +177,7 @@
 				modal = chat.getModal(data.fromuid);
 				chat.appendChatMessage(modal, data.message, data.timestamp);
 			} else {
-				modal = chat.createModal(data.username, data.fromuid);				
+				modal = chat.createModal(data.username, data.fromuid);
 			}
 
 			chat.load(modal.attr('UUID'));
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index c40ae52c36..71d6fe93d8 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -53,29 +53,35 @@
 					<li>
 						<a href="/users">Users</a>
 					</li>
+					<!--Enable when /search form is completed <li class="visible-xs">
+						<a href="/search">Search</a>
+					</li>-->
 					<li>
 						<a href="/"></a>
 					</li>
 				</ul>
 
-
+				<form id="search-form" class="navbar-form navbar-right hidden-xs" role="search" method="GET" action="">
+					<div class="hide" id="search-fields">
+				    	<div class="form-group">
+							<input type="text" class="form-control" placeholder="Search" name="query">
+				    	</div>
+				    	<button type="submit" class="btn btn-default hide">Search</button>
+				    </div>
+			    	<button id="search-button" type="button" class="btn btn-link nodebb-loggedin"><i class="icon-search"></i></button>
+			    </form>
 
 				<ul id="right-menu" class="nav navbar-nav navbar-right">
-					<li class="notifications dropdown text-center">
+					<li class="notifications dropdown text-center hidden-xs">
 						<a class="dropdown-toggle" data-toggle="dropdown" href="#" id="notif_dropdown"><i class="icon-circle-blank"></i></a>
 						<ul id="notif-list" class="dropdown-menu" aria-labelledby="notif_dropdown">
-							<li><a href="#"><i class="icon-refresh icon-spin"></i> Loading Notifications</a></li>
+							<li>
+								<a href="#"><i class="icon-refresh icon-spin"></i> Loading Notifications</a>
+							</li>
 						</ul>
 					</li>
-					<li>
-						<form id="search-form" class="navbar-form navbar-right" role="search" method="GET" action="">
-					      <div class="form-group">
-					        <input type="text" class="form-control" placeholder="Search" name="query">
-					      </div>
-					      <button type="submit" class="btn btn-default hide">Search</button>
-					    </form>
-					</li>
 				</ul>
+
 				<div id="pagination"></div>
 			</div>
 		</div>

From 7795a9ead259ecbbd4e381777b49185ec3f07fb4 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 30 Aug 2013 15:07:58 -0400
Subject: [PATCH 18/20] fixed a crash

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

diff --git a/src/postTools.js b/src/postTools.js
index 8f0aaaf6d5..d8e97cc66f 100644
--- a/src/postTools.js
+++ b/src/postTools.js
@@ -167,7 +167,7 @@ var	RDB = require('./redis.js'),
 						});
 					});
 
-					// Restore topic if it is the only post 
+					// Restore topic if it is the only post
 					topics.getTopicField(postData.tid, 'postcount', function(err, count) {
 						if (count === '1') {
 							threadTools.restore(postData.tid, uid);
@@ -186,6 +186,7 @@ var	RDB = require('./redis.js'),
 	}
 
 	PostTools.toHTML = function(raw, callback) {
+		raw = raw || '';
 		plugins.fireHook('filter:post.parse', raw, function(parsed) {
 			var	cheerio = require('cheerio');
 

From 40897d0be6fe425f0675f9b17e0e9ab6cc8ab39c Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Sat, 31 Aug 2013 03:46:44 +0800
Subject: [PATCH 19/20] themed reset.tpl and reset_code.tpl to BS3, closes #239

---
 public/src/forum/reset_code.js  |  9 +++++++--
 public/templates/reset.tpl      | 27 ++++++++++++++++++++-------
 public/templates/reset_code.tpl | 30 ++++++++++++++++++++++--------
 3 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/public/src/forum/reset_code.js b/public/src/forum/reset_code.js
index fffc3dadf3..3bc8906777 100644
--- a/public/src/forum/reset_code.js
+++ b/public/src/forum/reset_code.js
@@ -10,9 +10,14 @@
 		if (password.value.length < 6) {
 			$('#error').hide();
 			noticeEl.querySelector('strong').innerHTML = 'Invalid Password';
-			noticeEl.querySelector('p').innerHTML = 'The password entered it too short, please pick a different password!';
+			noticeEl.querySelector('p').innerHTML = 'The password entered is too short, please pick a different password.';
 			noticeEl.style.display = 'block';
-		} else if (password.value === repeat.value) {
+		} else if (password.value !== repeat.value) {
+			$('#error').hide();
+			noticeEl.querySelector('strong').innerHTML = 'Invalid Password';
+			noticeEl.querySelector('p').innerHTML = 'The two passwords you\'ve entered do not match.';
+			noticeEl.style.display = 'block';
+		} else {
 			socket.emit('user:reset.commit', { code: reset_code, password: password.value });
 		}
 	}, false);
diff --git a/public/templates/reset.tpl b/public/templates/reset.tpl
index 42d3d12f08..5dadf7ce32 100644
--- a/public/templates/reset.tpl
+++ b/public/templates/reset.tpl
@@ -1,17 +1,30 @@
-<h1>Reset Password</h1>
+<ol class="breadcrumb">
+	<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+		<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
+	</li>
+	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+		<span itemprop="title">Reset Password</span>
+	</li>
+</ol>
+
+<div class="alert alert-info">
+			Please enter your <strong>email address</strong> and we will send you an email with instructions on how to reset your account.
+		</div>
 <div class="well">
 	<div class="alert alert-success" id="success" style="display:none">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<strong>Password Reset Sent</strong>
-		<p></p>
 	</div>
-	<div class="alert" id="error" style="display:none">
+	<div class="alert alert-danger" id="error" style="display:none">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
-		<strong>Invalid Email!</strong>
-		<p></p>
+		<strong>Invalid Email / Email does not exist!</strong>
 	</div>
-	<label for="email">Email Address</label><input type="text" placeholder="Enter Email Address" id="email" /><br />
-	<button class="btn btn-primary" id="reset" type="submit">Reset Password</button>
+	<form onsubmit="return false;">
+		<input type="text" class="form-control input-block input-lg" placeholder="Enter Email Address" id="email" />
+
+		<br />
+		<button class="btn btn-primary btn-block btn-lg" id="reset" type="submit">Reset Password</button>
+	</form>
 </div>
 
 <script type="text/javascript" src="{relative_path}/src/forum/reset.js"></script>
\ No newline at end of file
diff --git a/public/templates/reset_code.tpl b/public/templates/reset_code.tpl
index 700005b3f7..dc8a4aab07 100644
--- a/public/templates/reset_code.tpl
+++ b/public/templates/reset_code.tpl
@@ -1,23 +1,37 @@
-<h1>Reset Password</h1>
+<ol class="breadcrumb">
+	<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+		<a href="/" itemprop="url"><span itemprop="title">Home</span></a>
+	</li>
+	<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+		<a href="/reset" itemprop="url"><span itemprop="title">Reset Password</span></a>
+	</li>
+	<li class="active" itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb">
+		<span itemprop="title">Update Password</span>
+	</li>
+</ol>
+
+
 <div class="well">
 	<div class="alert alert-success" id="success" style="display:none">
 		<button type="button" class="close" data-dismiss="alert">&times;</button>
 		<strong>Password Changed</strong>
 		<p>Password successfully reset, please <a href="/login">log in again</a>.</p>
 	</div>
-	<div class="alert" id="notice" style="display:none">
+	<div class="alert alert-warning" id="notice" style="display:none">
 		<strong></strong>
 		<p></p>
 	</div>
-	<div class="alert alert-error" id="error" style="display:none">
+	<div class="alert alert-danger" id="error" style="display:none">
 		<strong>Incorrect Reset Code</strong>
 		<p>The reset code received was incorrect. Please try again, or <a href="/reset">request a new reset code</a></p>
 	</div>
-	<div id="reset-form">
-		<label for="password">New Password</label><input type="password" placeholder="A new password" id="password" /><br />
-		<label for="repeat">... and again</label><input type="password" placeholder="The same password" id="repeat" /><br />
-		<button class="btn btn-primary" id="reset" type="submit" disabled>Reset Password</button>
-	</div>
+	<form onsubmit="return false;" id="reset-form">
+		<label for="password">New Password</label>
+		<input class="form-control input-lg" type="password" placeholder="A new password" id="password" /><br />
+		<label for="repeat">Confirm Password</label>
+		<input class="form-control input-lg" type="password" placeholder="The same password" id="repeat" /><br />
+		<button class="btn btn-primary btn-lg btn-block" id="reset" type="submit" disabled>Reset Password</button>
+	</form>
 </div>
 <input type="hidden" template-variable="reset_code" value="{reset_code}" />
 

From 09b578522f9f621b899ed3ce3eba821fc9a60b20 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Sun, 1 Sep 2013 15:21:28 -0400
Subject: [PATCH 20/20] added prefic to less middleware

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

diff --git a/src/webserver.js b/src/webserver.js
index 4e072787b8..d802929f53 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -58,7 +58,7 @@ var express = require('express'),
 
 	// Middlewares
 	app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
-	app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public') }));
+	app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public'), prefix:nconf.get('relative_path') }));
 	app.use(nconf.get('relative_path'), express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser());	// Puts POST vars in request.body
 	app.use(express.cookieParser());	// If you want to parse cookies (res.cookies)