From c8208f2a3e514429c36587961d0359cbe7276d0a Mon Sep 17 00:00:00 2001
From: Hack Pie <hi@sqli.me>
Date: Tue, 4 Feb 2014 02:18:43 -0500
Subject: [PATCH 01/16] We must advance!

---
 public/templates/admin/footer.tpl | 2 +-
 public/templates/footer.tpl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/templates/admin/footer.tpl b/public/templates/admin/footer.tpl
index 48d6288c8e..6e67767f4c 100644
--- a/public/templates/admin/footer.tpl
+++ b/public/templates/admin/footer.tpl
@@ -41,7 +41,7 @@
 	<div id="alert_window"></div>
 
 	<div id="footer" class="container" style="padding-top: 50px; display:none;">
-		<footer class="footer">Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.com">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></footer>
+		<footer class="footer">Copyright &copy; 2014 <a target="_blank" href="http://www.nodebb.com">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></footer>
 	</div>
 
 <script type="text/javascript">
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index e461beae4f..c8646bc4a3 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -44,7 +44,7 @@
 	<footer id="footer" class="container footer hide">
 		{footerHTML}
 		<div class="copyright">
-			Copyright &copy; 2013 <a target="_blank" href="https://www.nodebb.com">NodeBB Forums</a> | <a target="_blank" href="//github.com/designcreateplay/NodeBB/graphs/contributors">Contributors</a>
+			Copyright &copy; 2014 <a target="_blank" href="https://www.nodebb.com">NodeBB Forums</a> | <a target="_blank" href="//github.com/designcreateplay/NodeBB/graphs/contributors">Contributors</a>
 		</div>
 	</footer>
 

From cecd3fe969328029643bfd8fe43c6882db0a6878 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 4 Feb 2014 10:37:27 -0500
Subject: [PATCH 02/16] adding return false to favouriting and following. using
 jq for follow  code

---
 public/src/forum/topic.js | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index f877870b1e..5c93e5f5a5 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -296,7 +296,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				set_follow_state = function(state, quiet) {
 					if (state && !followEl.hasClass('btn-success')) {
 						followEl.addClass('btn-success');
-						followEl[0].title = 'You are currently receiving updates to this topic';
+						followEl.attr('title', 'You are currently receiving updates to this topic');
 						if (!quiet) {
 							app.alert({
 								alert_id: 'topic_follow',
@@ -308,7 +308,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 						}
 					} else if (!state && followEl.hasClass('btn-success')) {
 						followEl.removeClass('btn-success');
-						followEl[0].title = 'Be notified of new replies in this topic';
+						followEl.attr('title', 'Be notified of new replies in this topic');
 						if (!quiet) {
 							app.alert({
 								alert_id: 'topic_follow',
@@ -325,23 +325,23 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				set_follow_state(state, true);
 			});
 
-			if (followEl[0]) {
-				followEl[0].addEventListener('click', function() {
-					socket.emit('topics.follow', tid, function(err, state) {
-						if(err) {
-							return app.alert({
-								type: 'danger',
-								alert_id: 'topic_follow',
-								title: 'Please Log In',
-								message: 'Please register or log in in order to subscribe to this topic',
-								timeout: 5000
-							});
-						}
+			followEl.on('click', function() {
+				socket.emit('topics.follow', tid, function(err, state) {
+					if(err) {
+						return app.alert({
+							type: 'danger',
+							alert_id: 'topic_follow',
+							title: 'Please Log In',
+							message: 'Please register or log in in order to subscribe to this topic',
+							timeout: 5000
+						});
+					}
 
-						set_follow_state(state);
-					});
-				}, false);
-			}
+					set_follow_state(state);
+				});
+
+				return false;
+			});
 
 			enableInfiniteLoading();
 
@@ -438,6 +438,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				pid: pid,
 				room_id: app.currentRoom
 			});
+
+			return false;
 		});
 
 		$('#post-container').on('click', '.flag', function() {

From 3c63b135c779e2ef09f145c64d4ba511551fe3f9 Mon Sep 17 00:00:00 2001
From: psychobunny <psycho.bunny@hotmail.com>
Date: Tue, 4 Feb 2014 11:50:50 -0500
Subject: [PATCH 03/16] closes #939

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

diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 5c93e5f5a5..a532693cc8 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -443,13 +443,17 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 		});
 
 		$('#post-container').on('click', '.flag', function() {
-			var pid = $(this).parents('.post-row').attr('data-pid');
+			bootbox.confirm('Are you sure you want to flag this post?', function(confirm) {
+				if (confirm) {
+					var pid = $(this).parents('.post-row').attr('data-pid');
 
-			socket.emit('posts.flag', pid, function(err) {
-				if(err) {
-					return app.alertError(err.message);
+					socket.emit('posts.flag', pid, function(err) {
+						if(err) {
+							return app.alertError(err.message);
+						}
+						app.alertSuccess('This post has been flagged for moderation.');
+					});
 				}
-				app.alertSuccess('This post has been flagged for moderation.');
 			});
 		});
 

From 574e981de91e5e7d664cb1d91a8072ce650ef5ee Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 4 Feb 2014 17:31:05 -0500
Subject: [PATCH 04/16] closes #831, user profile changes

---
 public/language/en_GB/user.json      |   1 +
 public/src/forum/account.js          |   6 +-
 public/src/forum/accountedit.js      |   2 +-
 public/src/forum/accountheader.js    |  59 ++++++++-----
 public/src/forum/accountposts.js     |  52 +++++++++++
 public/templates/account.tpl         | 127 ++++++++++++++-------------
 public/templates/accountedit.tpl     |   7 +-
 public/templates/accountposts.tpl    |  41 +++++++++
 public/templates/accountsettings.tpl |   7 +-
 public/templates/config.json         |   1 +
 public/templates/favourites.tpl      |   9 +-
 public/templates/followers.tpl       |   7 +-
 public/templates/following.tpl       |   7 +-
 src/posts.js                         |  23 ++++-
 src/routes/user.js                   |  41 ++++++++-
 src/socket.io/posts.js               |  11 +++
 16 files changed, 283 insertions(+), 118 deletions(-)
 create mode 100644 public/src/forum/accountposts.js
 create mode 100644 public/templates/accountposts.tpl

diff --git a/public/language/en_GB/user.json b/public/language/en_GB/user.json
index 0bf297ce54..eef538f4bd 100644
--- a/public/language/en_GB/user.json
+++ b/public/language/en_GB/user.json
@@ -9,6 +9,7 @@
 	"age": "Age",
 	"joined": "Joined",
 	"lastonline": "Last Online",
+	"profile": "Profile",
 	"profile_views": "Profile views",
 	"reputation": "Reputation",
 	"posts": "Posts",
diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index 51f43d5ffb..f02cb17f29 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -88,11 +88,7 @@ define(['forum/accountheader'], function(header) {
 			return;
 		}
 
-		translator.get('global:' + data.status, function(translated) {
-			onlineStatus.find('span span').text(translated);
-			onlineStatus.find('i').attr('class', 'fa fa-circle status ' + data.status);
-		});
-
+		onlineStatus.attr('class', 'account-online-status fa fa-circle status ' + data.status);
 	};
 
 	return Account;
diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js
index bffa7660c0..b33d8f2d4a 100644
--- a/public/src/forum/accountedit.js
+++ b/public/src/forum/accountedit.js
@@ -42,7 +42,7 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) {
 						$('.account-username-box a').each(function(index) {
 							$(this).attr('href', $(this).attr('href').replace(oldslug, data.userslug));
 						});
-						$('.account-username a:first-child').html(userData.username);
+
 						$('.account-username-box').attr('data-userslug', data.userslug);
 
 						$('#user-profile-link').attr('href', config.relative_path + '/user/' + data.userslug);
diff --git a/public/src/forum/accountheader.js b/public/src/forum/accountheader.js
index 1f5c552783..291d25e050 100644
--- a/public/src/forum/accountheader.js
+++ b/public/src/forum/accountheader.js
@@ -2,45 +2,60 @@ define(function() {
 	var	AccountHeader = {};
 
 	AccountHeader.init = function() {
-		var yourid = templates.get('yourid'),
-			theirid = templates.get('theirid');
+
 
 		AccountHeader.createMenu();
 
+		hideLinks();
+
+		selectActivePill();
+	}
+
+	AccountHeader.createMenu = function() {
+		var userslug = $('.account-username-box').attr('data-userslug');
+
+		var html ='<ul class="nav nav-tabs account-sub-links">\
+					<li id="settingsLink"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">[[user:settings]]</a></li>\
+					<li id="favouritesLink"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">[[user:favourites]]</a></li>\
+					<li><a href="' + RELATIVE_PATH + '/user/' + userslug + '/posts">[[global:posts]]</a></li>\
+					<li><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">[[user:followers]]</a></li>\
+					<li><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">[[user:following]]</a></li>\
+					<li id="editLink"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">[[user:edit]]</a></li>\
+					<li id="profile"><a href="' + RELATIVE_PATH + '/user/' + userslug + '">[[user:profile]]</a></li>\
+				</ul>';
+
+
+		translator.translate(html, function(translatedHtml) {
+			$('.account-username-box').append(translatedHtml);
+			selectActivePill();
+			hideLinks();
+		});
+	}
+
+	function hideLinks() {
+		var yourid = templates.get('yourid'),
+			theirid = templates.get('theirid');
+
 		var editLink = $('#editLink');
 		var settingsLink = $('#settingsLink');
 		var favouritesLink = $('#favouritesLink');
 
-		if (yourid === "0" || yourid !== theirid) {
+		if (parseInt(yourid, 10) === 0 || parseInt(yourid, 10) !== parseInt(theirid, 10)) {
 			editLink.hide();
 			settingsLink.hide();
 			favouritesLink.hide();
 		}
+	}
 
-		jQuery('.account-sub-links span a').removeClass('bold').each(function() {
-			var href = this.getAttribute('href');
+	function selectActivePill() {
+		$('.account-sub-links li').removeClass('active').each(function() {
+			var href = $(this).find('a').attr('href');
 			if (window.location.href.indexOf(href) !== -1) {
-				jQuery(this).addClass('bold');
+				$(this).addClass('active');
 				return false;
 			}
 		});
 	}
 
-	AccountHeader.createMenu = function() {
-		var userslug = $('.account-username-box').attr('data-userslug');
-
-		var html = '<div class="account-sub-links inline-block pull-right">\
-			<span id="settingsLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/settings">[[user:settings]]</a></span>\
-			<span id="favouritesLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/favourites">[[user:favourites]]</a></span>\
-			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/followers">[[user:followers]]</a></span>\
-			<span class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/following">[[user:following]]</a></span>\
-			<span id="editLink" class="pull-right"><a href="' + RELATIVE_PATH + '/user/' + userslug + '/edit">[[user:edit]]</a></span>\
-		</div>'
-
-		translator.translate(html, function(translatedHtml) {
-			$('.account-username-box').append(translatedHtml);
-		});
-	}
-
 	return AccountHeader;
 });
\ No newline at end of file
diff --git a/public/src/forum/accountposts.js b/public/src/forum/accountposts.js
new file mode 100644
index 0000000000..76b2991b88
--- /dev/null
+++ b/public/src/forum/accountposts.js
@@ -0,0 +1,52 @@
+define(['forum/accountheader'], function(header) {
+	var AccountPosts = {},
+		loadingMore = false;
+
+	AccountPosts.init = function() {
+		header.init();
+
+		app.enableInfiniteLoading(function() {
+			if(!loadingMore) {
+				loadMore();
+			}
+		});
+	};
+
+	function loadMore() {
+		loadingMore = true;
+		socket.emit('posts.loadMoreUserPosts', {
+			uid: $('.account-username-box').attr('data-uid'),
+			after: $('.user-favourite-posts').attr('data-nextstart')
+		}, function(err, data) {
+			if(err) {
+				return app.alertError(err.message);
+			}
+
+			if (data.posts && data.posts.length) {
+				onTopicsLoaded(data.posts);
+				$('.user-favourite-posts').attr('data-nextstart', data.nextStart);
+			}
+
+			loadingMore = false;
+		});
+	}
+
+	function onTopicsLoaded(posts) {
+		var html = templates.prepare(templates['accountposts'].blocks['posts']).parse({
+			posts: posts
+		});
+
+		translator.translate(html, function(translatedHTML) {
+
+			$('#category-no-topics').remove();
+
+			html = $(translatedHTML);
+			$('.user-favourite-posts').append(html);
+			$('span.timeago').timeago();
+			app.createUserTooltips();
+			app.makeNumbersHumanReadable(html.find('.human-readable-number'));
+		});
+	}
+
+	return AccountPosts;
+});
\ No newline at end of file
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 4bcb96b7df..f2b05763bc 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -2,112 +2,119 @@
 <div class="well account">
 
 	<div class="account-username-box" data-userslug="{userslug}">
-		<span class="account-username">
-			<a href="{relative_path}/user/{userslug}">{username}</a>
-		</span>
+
 	</div>
 
 	<div class="row">
-		<div class="col-md-2 account-block" style="text-align: center; margin-bottom:20px;">
-			<div class="account-picture-block">
-				<img src="{picture}" class="user-profile-picture img-thumbnail"/>
-			</div>
-			<div class="account-online-status">
-				<span><i class="fa fa-circle status offline"></i> <span>[[user:offline]]</span></span>
-			</div>
-			<!-- IF banned -->
-			<div>
-				<span class="label label-danger">[[user:banned]]</span>
-			</div>
-			<!-- ENDIF banned -->
-			<div>
-				<a id="chat-btn" href="#" class="btn btn-default hide">Chat</a>
+		<div class="col-md-5 account-block">
+
+			<div class="text-center account-picture-block">
+				<div>
+					<a href="{relative_path}/user/{userslug}"><img src="{picture}" class="user-profile-picture img-thumbnail"/></a>
+				</div>
+
+				<div>
+					<div>
+						<span>
+							<i class="account-online-status fa fa-circle status offline"></i>
+							<span class="account-username"> {username}</span>
+						</span>
+					</div>
+
+					<!-- IF banned -->
+					<div>
+						<span class="label label-danger">[[user:banned]]</span>
+					</div>
+					<!-- ENDIF banned -->
+					<div>
+						<a id="chat-btn" href="#" class="btn btn-primary hide">Chat</a>
+						<a id="follow-btn" href="#" class="btn btn-success hide">Follow</a>
+						<a id="unfollow-btn" href="#" class="btn btn-warning hide">Unfollow</a>
+					</div>
+				</div>
+
 			</div>
-			<div id="user-actions">
-				<a id="follow-btn" href="#" class="btn btn-default hide">Follow</a>
-				<a id="unfollow-btn" href="#" class="btn btn-default hide">Unfollow</a>
+
+			<div class="text-center account-stats panel panel-default">
+				<div class="panel-body">
+					<div class="inline-block text-center">
+						<div class="formatted-number">{postcount}</div>
+						<div class="account-bio-label">[[user:posts]]</div>
+					</div>
+
+					<div class="inline-block text-center">
+						<div class="formatted-number">{followerCount}</div>
+						<div class="account-bio-label">[[user:followers]]</div>
+					</div>
+
+					<div class="inline-block text-center">
+						<div class="formatted-number">{followingCount}</div>
+						<div class="account-bio-label">[[user:following]]</div>
+					</div>
+				</div>
 			</div>
-		</div>
 
-		<div class="col-md-4">
-			<div class="inline-block">
-				<div class="account-bio-block">
-					<span class="account-bio-label">[[user:email]]</span><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i>
+			<div class="panel panel-default">
+				<div class="panel-body">
+					<span class="account-bio-label">[[user:email]]</span>
 					<!-- IF email -->
-					<span>{email}</span>
+					<span class="account-bio-value"><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i> {email}</span>
 					<!-- ELSE -->
 					<i class="fa fa-eye-slash" title="[[user:email_hidden]]"></i> [[user:hidden]]
 					<!-- ENDIF email -->
-					<br/>
-
 
 					<!-- IF fullname -->
 					<span class="account-bio-label">[[user:fullname]]</span>
-					<span>{fullname}</span>
-					<br/>
+					<span class="account-bio-value">{fullname}</span>
 					<!-- ENDIF fullname -->
 
 					<!-- IF website -->
 					<span class="account-bio-label">[[user:website]]</span>
-					<span><a href="{website}">{websiteName}</a></span>
-					<br/>
+					<span class="account-bio-value"><a href="{website}">{websiteName}</a></span>
 					<!-- ENDIF website -->
 
 					<!-- IF location -->
 					<span class="account-bio-label">[[user:location]]</span>
-					<span>{location}</span>
-					<br/>
+					<span class="account-bio-value">{location}</span>
 					<!-- ENDIF location -->
 
 					<!-- IF age -->
 					<span class="account-bio-label">[[user:age]]</span>
-					<span>{age}</span>
-					<br/>
+					<span class="account-bio-value">{age}</span>
+
 					<!-- ENDIF age -->
 
 					<hr/>
-					<span class="account-bio-label">[[user:joined]]</span>
-					<span class="timeago" title="{joindate}"></span>
-					<br/>
-
-					<span class="account-bio-label">[[user:lastonline]]</span>
-					<span class="timeago" title="{lastonline}"></span>
-					<br/>
 
 					<span class="account-bio-label">[[user:profile_views]]</span>
-					<span class="formatted-number">{profileviews}</span>
-					<br/>
+					<span class="formatted-number account-bio-value">{profileviews}</span>
 
 					<span class="account-bio-label">[[user:reputation]]</span>
-					<span class="formatted-number">{reputation}</span>
-					<br/>
-
-					<span class="account-bio-label">[[user:posts]]</span>
-					<span class="formatted-number">{postcount}</span>
-					<br/>
+					<span class="formatted-number account-bio-value">{reputation}</span>
 
-					<span class="account-bio-label">[[user:followers]]</span>
-					<span class="formatted-number">{followerCount}</span>
-					<br/>
+					<span class="account-bio-label">[[user:joined]]</span>
+					<span class="timeago account-bio-value" title="{joindate}"></span>
 
-					<span class="account-bio-label">[[user:following]]</span>
-					<span class="formatted-number">{followingCount}</span>
-					<br/>
+					<span class="account-bio-label">[[user:lastonline]]</span>
+					<span class="timeago account-bio-value" title="{lastonline}"></span>
 
-					<hr/>
 					<!-- IF !disableSignatures -->
 					<!-- IF signature -->
+					<hr/>
 					<span class="account-bio-label">[[user:signature]]</span>
-					<div class="post-signature">
+					<div class="post-signature account-bio-value">
 						<span id='signature'>{signature}</span>
 					</div>
 					<!-- ENDIF signature -->
 					<!-- ENDIF !disableSignatures -->
 				</div>
 			</div>
+
+
 		</div>
 
-		<div class="col-md-6 user-recent-posts">
+
+		<div class="col-md-7 user-recent-posts">
 			<div class="topic-row panel panel-default clearfix">
 				<div class="panel-heading">
 					<h3 class="panel-title">[[global:recentposts]]</h3>
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index b511bf5917..3720df04cb 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -30,11 +30,8 @@
 		</div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
 
-	<div class="account-username-box" data-userslug="{userslug}">
-		<span class="account-username">
-			<a href="{relative_path}/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
-			<a href="{relative_path}/user/{userslug}/edit">[[user:edit]]</a>
-		</span>
+	<div class="account-username-box clearfix" data-userslug="{userslug}">
+
 	</div>
 
 	<div class="row">
diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl
new file mode 100644
index 0000000000..e2196327e8
--- /dev/null
+++ b/public/templates/accountposts.tpl
@@ -0,0 +1,41 @@
+<div class="well favourites">
+	<div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
+
+	</div>
+
+	<!-- IF !posts.length -->
+		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
+	<!-- ENDIF !posts.length -->
+
+	<div class="row">
+		<div class="col-md-12 user-favourite-posts" data-nextstart="{nextStart}">
+			<!-- BEGIN posts -->
+			<div class="topic-row panel panel-default clearfix">
+				<div class="panel-body">
+					<a href="../../user/{posts.userslug}">
+						<img title="{posts.username}" class="img-rounded user-img" src="{posts.picture}">
+					</a>
+
+					<a href="../../user/{posts.userslug}">
+						<strong><span>{posts.username}</span></strong>
+					</a>
+					<p>{posts.content}</p>
+
+					<div>
+						<small>
+							<span class="pull-right">
+								<a href="../../topic/{posts.tid}/#{posts.pid}">posted</a>
+								in
+								<a href="../../category/{posts.categorySlug}">
+									<i class="fa {posts.categoryIcon}"></i> {posts.categoryName}
+								</a>
+								<span class="timeago" title="{posts.relativeTime}"></span>
+							</span>
+						</small>
+					</div>
+				</div>
+			</div>
+			<!-- END posts -->
+		</div>
+	</div>
+</div>
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index f90b978973..377bd80e61 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -1,10 +1,7 @@
 <div class="well account">
 
-	<div class="account-username-box" data-userslug="{userslug}">
-		<span class="account-username">
-			<a href="{relative_path}/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
-			<a href="{relative_path}/user/{userslug}/settings">[[user:settings]]</a>
-		</span>
+	<div class="account-username-box clearfix" data-userslug="{userslug}">
+
 	</div>
 
 	<div class="row">
diff --git a/public/templates/config.json b/public/templates/config.json
index 5bdcd81c5e..11126c65a8 100644
--- a/public/templates/config.json
+++ b/public/templates/config.json
@@ -23,6 +23,7 @@
 		"^user.*followers": "followers",
 		"^user.*settings": "accountsettings",
 		"^user.*favourites": "favourites",
+		"^user.*posts": "accountposts",
 		"^user/.*": "account",
 
 		"^recent/.*": "recent",
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
index 13fc48bc27..a0edf132ee 100644
--- a/public/templates/favourites.tpl
+++ b/public/templates/favourites.tpl
@@ -1,13 +1,10 @@
 <div class="well favourites">
-	<div class="account-username-box" data-userslug="{userslug}">
-		<span class="account-username">
-			<a href="{relative_path}/user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
-			<a href="{relative_path}/user/{userslug}/favourites">[[topic:favourites]]</a>
-		</span>
+	<div class="account-username-box clearfix" data-userslug="{userslug}">
+
 	</div>
 
 	<!-- IF !posts.length -->
-		<div id="no-favourites-notice" class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
+		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
 	<!-- ENDIF !posts.length -->
 
 	<div class="row">
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl
index 7182280206..f56e92733b 100644
--- a/public/templates/followers.tpl
+++ b/public/templates/followers.tpl
@@ -1,10 +1,7 @@
 <div class="well users account">
 
-	<div class="account-username-box" data-userslug="{userslug}">
-		<span class="account-username">
-			<a href="../../user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
-			<a href="../../user/{userslug}/followers">[[user:followers]]</a>
-		</span>
+	<div class="account-username-box clearfix" data-userslug="{userslug}">
+
 	</div>
 
 	<div>
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index a2bf44c430..0f1e3b7acb 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -1,10 +1,7 @@
 <div class="well users account">
 
-	<div class="account-username-box" data-userslug="{userslug}">
-		<span class="account-username">
-			<a href="../../user/{userslug}">{username}</a> <i class="fa fa-chevron-right"></i>
-			<a href="../../user/{userslug}/following">[[user:following]]</a>
-		</span>
+	<div class="account-username-box clearfix" data-userslug="{userslug}">
+
 	</div>
 
 	<div>
diff --git a/src/posts.js b/src/posts.js
index 1f32708c7a..dd24aeed5a 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -169,11 +169,30 @@ var db = require('./database'),
 				});
 			}, function(pids) {
 				if (!(pids && pids.length)) {
-					return callback(null, []);
+					return callback(null, { posts: [], nextStart: 0});
 				}
 
 
-				Posts.getPostSummaryByPids(pids, false, callback);
+				Posts.getPostSummaryByPids(pids, false, function(err, posts) {
+					if(err) {
+						return callback(err);
+					}
+
+					if(!posts || !posts.length) {
+						return callback(null, { posts: [], nextStart: 0});
+					}
+
+					db.sortedSetRevRank('uid:' + uid + ':posts', posts[posts.length - 1].pid, function(err, rank) {
+						if(err) {
+							return calllback(err);
+						}
+						var userPosts = {
+							posts: posts,
+							nextStart: parseInt(rank, 10) + 1
+						};
+						callback(null, userPosts);
+					});
+				});
 			});
 		});
 	}
diff --git a/src/routes/user.js b/src/routes/user.js
index ebcdd5d304..1a4dc674be 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -72,6 +72,7 @@ var fs = require('fs'),
 			createRoute('/:userslug/following', '/following', 'following');
 			createRoute('/:userslug/followers', '/followers', 'followers');
 			createRoute('/:userslug/favourites', '/favourites', 'favourites');
+			createRoute('/:userslug/posts', '/posts', 'accountposts');
 
 			app.get('/:userslug/edit', function (req, res) {
 
@@ -363,6 +364,42 @@ var fs = require('fs'),
 			});
 		});
 
+		app.get('/api/user/:userslug/posts', function (req, res, next) {
+			var callerUID = req.user ? req.user.uid : '0';
+
+			user.getUidByUserslug(req.params.userslug, function (err, uid) {
+				if (!uid) {
+					res.json(404, {
+						error: 'User not found!'
+					});
+					return;
+				}
+
+				user.getUserFields(uid, ['username', 'userslug'], function (err, userData) {
+					if (err) {
+						return next(err);
+					}
+
+					if (userData) {
+						posts.getPostsByUid(callerUID, uid, 0, 19, function (err, userPosts) {
+							if (err) {
+								return next(err);
+							}
+							userData.uid = uid;
+							userData.posts = userPosts.posts;
+							userData.nextStart = userPosts.nextStart;
+
+							res.json(userData);
+						});
+					} else {
+						res.json(404, {
+							error: 'User not found!'
+						});
+					}
+				});
+			});
+		});
+
 		app.get('/api/user/:userslug', function (req, res, next) {
 			var callerUID = req.user ? req.user.uid : '0';
 
@@ -375,13 +412,13 @@ var fs = require('fs'),
 
 				user.isFollowing(callerUID, userData.theirid, function (isFollowing) {
 
-					posts.getPostsByUid(callerUID, userData.theirid, 0, 9, function (err, posts) {
+					posts.getPostsByUid(callerUID, userData.theirid, 0, 9, function (err, userPosts) {
 
 						if(err) {
 							return next(err);
 						}
 
-						userData.posts = posts.filter(function (p) {
+						userData.posts = userPosts.posts.filter(function (p) {
 							return p && parseInt(p.deleted, 10) !== 1;
 						});
 
diff --git a/src/socket.io/posts.js b/src/socket.io/posts.js
index de61541d73..250cca3589 100644
--- a/src/socket.io/posts.js
+++ b/src/socket.io/posts.js
@@ -258,4 +258,15 @@ SocketPosts.loadMoreFavourites = function(socket, data, callback) {
 	posts.getFavourites(socket.uid, start, end, callback);
 };
 
+SocketPosts.loadMoreUserPosts = function(socket, data, callback) {
+	if(!data || !data.after || !data.uid) {
+		return callback(new Error('invalid data'));
+	}
+
+	var start = parseInt(data.after, 10),
+		end = start + 9;
+
+	posts.getPostsByUid(socket.uid, data.uid, start, end, callback);
+};
+
 module.exports = SocketPosts;
\ No newline at end of file

From c17b8ae9a17749295e900a5461059aa3648a0bdd Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 4 Feb 2014 17:46:28 -0500
Subject: [PATCH 05/16] fixes

---
 public/templates/account.tpl         |  6 +++---
 public/templates/accountedit.tpl     | 10 ++++++----
 public/templates/accountposts.tpl    | 10 +++++++---
 public/templates/accountsettings.tpl |  9 ++++++---
 public/templates/favourites.tpl      | 10 +++++++---
 public/templates/followers.tpl       |  7 +++----
 public/templates/following.tpl       |  7 +++----
 src/routes/user.js                   |  7 +++++++
 8 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index f2b05763bc..951678aa08 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -1,9 +1,9 @@
 
-<div class="well account">
+<div class="account-username-box" data-userslug="{userslug}">
 
-	<div class="account-username-box" data-userslug="{userslug}">
+</div>
 
-	</div>
+<div class="well account">
 
 	<div class="row">
 		<div class="col-md-5 account-block">
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 3720df04cb..6d0e9a87c0 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -1,3 +1,7 @@
+<div class="account-username-box" data-userslug="{userslug}">
+
+</div>
+
 <div class="well account">
 
 	<div id="change-picture-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="[[user:change_picture]]" aria-hidden="true">
@@ -30,10 +34,6 @@
 		</div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
 
-	<div class="account-username-box clearfix" data-userslug="{userslug}">
-
-	</div>
-
 	<div class="row">
 		<div class="col-md-2" style="text-align: center; margin-bottom:20px;">
 			<div class="account-picture-block text-center">
@@ -150,5 +150,7 @@
 	</div>
 </div>
 
+<input type="hidden" template-variable="yourid" value="{yourid}" />
+<input type="hidden" template-variable="theirid" value="{theirid}" />
 <input type="hidden" template-variable="gravatarpicture" value="{gravatarpicture}" />
 <input type="hidden" template-variable="uploadedpicture" value="{uploadedpicture}" />
diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl
index e2196327e8..f1348cbba0 100644
--- a/public/templates/accountposts.tpl
+++ b/public/templates/accountposts.tpl
@@ -1,7 +1,8 @@
-<div class="well favourites">
-	<div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
+<div class="account-username-box clearfix" data-userslug="{userslug}" data-uid="{uid}">
 
-	</div>
+</div>
+
+<div class="well favourites">
 
 	<!-- IF !posts.length -->
 		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
@@ -39,3 +40,6 @@
 		</div>
 	</div>
 </div>
+
+<input type="hidden" template-variable="yourid" value="{yourid}" />
+<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl
index 377bd80e61..89ad7e803f 100644
--- a/public/templates/accountsettings.tpl
+++ b/public/templates/accountsettings.tpl
@@ -1,8 +1,8 @@
-<div class="well account">
+<div class="account-username-box clearfix" data-userslug="{userslug}">
 
-	<div class="account-username-box clearfix" data-userslug="{userslug}">
+</div>
 
-	</div>
+<div class="well account">
 
 	<div class="row">
 		<div class="col-md-6">
@@ -22,3 +22,6 @@
 		<a id="submitBtn" href="#" class="btn btn-primary">[[global:save_changes]]</a>
 	</div>
 </div>
+
+<input type="hidden" template-variable="yourid" value="{yourid}" />
+<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl
index a0edf132ee..e5e267a6cd 100644
--- a/public/templates/favourites.tpl
+++ b/public/templates/favourites.tpl
@@ -1,7 +1,8 @@
-<div class="well favourites">
-	<div class="account-username-box clearfix" data-userslug="{userslug}">
+<div class="account-username-box clearfix" data-userslug="{userslug}">
 
-	</div>
+</div>
+
+<div class="well favourites">
 
 	<!-- IF !posts.length -->
 		<div class="alert alert-warning">[[topic:favourites.has_no_favourites]]</div>
@@ -39,3 +40,6 @@
 		</div>
 	</div>
 </div>
+
+<input type="hidden" template-variable="yourid" value="{yourid}" />
+<input type="hidden" template-variable="theirid" value="{theirid}" />
\ No newline at end of file
diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl
index f56e92733b..8ae976c41d 100644
--- a/public/templates/followers.tpl
+++ b/public/templates/followers.tpl
@@ -1,9 +1,8 @@
-<div class="well users account">
-
-	<div class="account-username-box clearfix" data-userslug="{userslug}">
+<div class="account-username-box clearfix" data-userslug="{userslug}">
 
-	</div>
+</div>
 
+<div class="well users account">
 	<div>
 		<!-- BEGIN followers -->
 		<div class="users-box">
diff --git a/public/templates/following.tpl b/public/templates/following.tpl
index 0f1e3b7acb..541e3543d3 100644
--- a/public/templates/following.tpl
+++ b/public/templates/following.tpl
@@ -1,9 +1,8 @@
-<div class="well users account">
-
-	<div class="account-username-box clearfix" data-userslug="{userslug}">
+<div class="account-username-box clearfix" data-userslug="{userslug}">
 
-	</div>
+</div>
 
+<div class="well users account">
 	<div>
 		<!-- BEGIN following -->
 		<div class="users-box">
diff --git a/src/routes/user.js b/src/routes/user.js
index 1a4dc674be..b6574d245c 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -311,6 +311,9 @@ var fs = require('fs'),
 						} else {
 							userData.showemail = "";
 						}
+
+						userData.theirid = uid;
+						userData.yourid = callerUID;
 						res.json(userData);
 					} else {
 						res.json(404, {
@@ -350,6 +353,8 @@ var fs = require('fs'),
 								return next(err);
 							}
 
+							userData.theirid = uid;
+							userData.yourid = callerUID;
 							userData.posts = favourites.posts;
 							userData.nextStart = favourites.nextStart;
 
@@ -386,6 +391,8 @@ var fs = require('fs'),
 								return next(err);
 							}
 							userData.uid = uid;
+							userData.theirid = uid;
+							userData.yourid = callerUID;
 							userData.posts = userPosts.posts;
 							userData.nextStart = userPosts.nextStart;
 

From 9823ff0960a9e021c06ca1b9a37b365702d57669 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 4 Feb 2014 18:06:38 -0500
Subject: [PATCH 06/16] more fixes

---
 public/templates/account.tpl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 951678aa08..99954cba33 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -56,11 +56,10 @@
 
 			<div class="panel panel-default">
 				<div class="panel-body">
-					<span class="account-bio-label">[[user:email]]</span>
+
 					<!-- IF email -->
+					<span class="account-bio-label">[[user:email]]</span>
 					<span class="account-bio-value"><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i> {email}</span>
-					<!-- ELSE -->
-					<i class="fa fa-eye-slash" title="[[user:email_hidden]]"></i> [[user:hidden]]
 					<!-- ENDIF email -->
 
 					<!-- IF fullname -->
@@ -68,10 +67,10 @@
 					<span class="account-bio-value">{fullname}</span>
 					<!-- ENDIF fullname -->
 
-					<!-- IF website -->
+					<!-- IF websiteName -->
 					<span class="account-bio-label">[[user:website]]</span>
 					<span class="account-bio-value"><a href="{website}">{websiteName}</a></span>
-					<!-- ENDIF website -->
+					<!-- ENDIF websiteName -->
 
 					<!-- IF location -->
 					<span class="account-bio-label">[[user:location]]</span>
@@ -81,10 +80,8 @@
 					<!-- IF age -->
 					<span class="account-bio-label">[[user:age]]</span>
 					<span class="account-bio-value">{age}</span>
-
 					<!-- ENDIF age -->
 
-					<hr/>
 
 					<span class="account-bio-label">[[user:profile_views]]</span>
 					<span class="formatted-number account-bio-value">{profileviews}</span>
@@ -102,7 +99,7 @@
 					<!-- IF signature -->
 					<hr/>
 					<span class="account-bio-label">[[user:signature]]</span>
-					<div class="post-signature account-bio-value">
+					<div class="post-signature">
 						<span id='signature'>{signature}</span>
 					</div>
 					<!-- ENDIF signature -->

From 388532eedcb0dbe08d579f927bf8dee1410fd032 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 4 Feb 2014 18:16:45 -0500
Subject: [PATCH 07/16] closes #943

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

diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 1cf14248ed..5b7d710151 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -244,6 +244,9 @@ define(['taskbar'], function(taskbar) {
 				var selector = $(this).attr('data-pane');
 				postContainer.find('.tab-content div').removeClass('active');
 				postContainer.find(selector).addClass('active');
+				if(selector === '.tab-write') {
+					bodyEl.focus();
+				}
 				return false;
 			});
 

From d83b45a427a1c2902b6341c923b61fe744865014 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 4 Feb 2014 18:43:31 -0500
Subject: [PATCH 08/16] changed placed

---
 public/templates/account.tpl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 99954cba33..2906d2b910 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -38,18 +38,18 @@
 			<div class="text-center account-stats panel panel-default">
 				<div class="panel-body">
 					<div class="inline-block text-center">
-						<div class="formatted-number">{postcount}</div>
-						<div class="account-bio-label">[[user:posts]]</div>
+						<div class="formatted-number">{reputation}</div>
+						<div class="account-bio-label">[[user:reputation]]</div>
 					</div>
 
 					<div class="inline-block text-center">
-						<div class="formatted-number">{followerCount}</div>
-						<div class="account-bio-label">[[user:followers]]</div>
+						<div class="formatted-number">{postcount}</div>
+						<div class="account-bio-label">[[user:posts]]</div>
 					</div>
 
 					<div class="inline-block text-center">
-						<div class="formatted-number">{followingCount}</div>
-						<div class="account-bio-label">[[user:following]]</div>
+						<div class="formatted-number">{profileviews}</div>
+						<div class="account-bio-label">[[user:profile_views]]</div>
 					</div>
 				</div>
 			</div>
@@ -83,11 +83,11 @@
 					<!-- ENDIF age -->
 
 
-					<span class="account-bio-label">[[user:profile_views]]</span>
-					<span class="formatted-number account-bio-value">{profileviews}</span>
+					<span class="account-bio-label">[[user:followers]]</span>
+					<span class="formatted-number account-bio-value">{followerCount}</span>
 
-					<span class="account-bio-label">[[user:reputation]]</span>
-					<span class="formatted-number account-bio-value">{reputation}</span>
+					<span class="account-bio-label">[[user:following]]</span>
+					<span class="formatted-number account-bio-value">{followingCount}</span>
 
 					<span class="account-bio-label">[[user:joined]]</span>
 					<span class="timeago account-bio-value" title="{joindate}"></span>

From a01008cf7dc859de3850ebded1bffdf1095a4d21 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Tue, 4 Feb 2014 19:19:57 -0500
Subject: [PATCH 09/16] only logged in users increase profile view count

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

diff --git a/src/routes/user.js b/src/routes/user.js
index b6574d245c..26ea4cc4f5 100644
--- a/src/routes/user.js
+++ b/src/routes/user.js
@@ -435,7 +435,7 @@ var fs = require('fs'),
 							userData.profileviews = 1;
 						}
 
-						if (parseInt(callerUID, 10) !== parseInt(userData.uid, 10)) {
+						if (parseInt(callerUID, 10) !== parseInt(userData.uid, 10) && parseInt(callerUID, 0)) {
 							user.incrementUserFieldBy(userData.uid, 'profileviews', 1);
 						}
 

From 01cb67d1f3bd45a4b46c8387079bacc1f4c4ac1e Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 5 Feb 2014 18:25:13 -0500
Subject: [PATCH 10/16] closes #945

---
 src/emailer.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/emailer.js b/src/emailer.js
index 18c48256cc..aa9c24e350 100644
--- a/src/emailer.js
+++ b/src/emailer.js
@@ -32,18 +32,23 @@ Emailer.send = function(template, uid, params) {
 		}
 	}, function(err, results) {
 		User.getUserField(uid, 'email', function(err, email) {
-			if (!err) {
-				Plugins.fireHook('action:email.send', {
-					to: email,
-					from: Meta.config['email:from'] || 'no-reply@localhost.lan',
-					subject: params.subject,
-					html: results.html,
-					plaintext: results.plaintext,
-
-					template: template,
-					uid: uid
-				});
+			if(err) {
+				return winston.error(err.message);
 			}
+
+			if(!email) {
+				return winston.warn('uid : ' + uid + ' has no email, not sending.');
+			}
+
+			Plugins.fireHook('action:email.send', {
+				to: email,
+				from: Meta.config['email:from'] || 'no-reply@localhost.lan',
+				subject: params.subject,
+				html: results.html,
+				plaintext: results.plaintext,
+				template: template,
+				uid: uid
+			});
 		});
 	});
 };

From 8ef9d787f56efd627d9c83692750c79b8d3c01a9 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 5 Feb 2014 20:20:04 -0500
Subject: [PATCH 11/16] human readable profile page numbers

---
 public/src/forum/account.js  |  1 +
 public/templates/account.tpl | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index f02cb17f29..efb200c896 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -13,6 +13,7 @@ define(['forum/accountheader'], function(header) {
 			app.enterRoom('user/' + theirid);
 
 			app.addCommasToNumbers();
+			app.makeNumbersHumanReadable($('.account .human-readable-number'));
 			$('.user-recent-posts img').addClass('img-responsive');
 
 			var followBtn = $('#follow-btn');
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 2906d2b910..efdc406c7c 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -38,17 +38,17 @@
 			<div class="text-center account-stats panel panel-default">
 				<div class="panel-body">
 					<div class="inline-block text-center">
-						<div class="formatted-number">{reputation}</div>
+						<div class="human-readable-number" title="{reputation}">{reputation}</div>
 						<div class="account-bio-label">[[user:reputation]]</div>
 					</div>
 
 					<div class="inline-block text-center">
-						<div class="formatted-number">{postcount}</div>
+						<div class="human-readable-number" title="{postcount}">{postcount}</div>
 						<div class="account-bio-label">[[user:posts]]</div>
 					</div>
 
 					<div class="inline-block text-center">
-						<div class="formatted-number">{profileviews}</div>
+						<div class="human-readable-number" title="{profileviews}">{profileviews}</div>
 						<div class="account-bio-label">[[user:profile_views]]</div>
 					</div>
 				</div>
@@ -84,10 +84,10 @@
 
 
 					<span class="account-bio-label">[[user:followers]]</span>
-					<span class="formatted-number account-bio-value">{followerCount}</span>
+					<span class="human-readable-number account-bio-value" title="{followerCount}">{followerCount}</span>
 
 					<span class="account-bio-label">[[user:following]]</span>
-					<span class="formatted-number account-bio-value">{followingCount}</span>
+					<span class="human-readable-number account-bio-value"  title="{followingCount}">{followingCount}</span>
 
 					<span class="account-bio-label">[[user:joined]]</span>
 					<span class="timeago account-bio-value" title="{joindate}"></span>

From 6d866ccc86f32056b2a6b458cc62e0993fc7ebe4 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 5 Feb 2014 20:29:13 -0500
Subject: [PATCH 12/16] chat profile picture will go to users profile

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

diff --git a/src/messaging.js b/src/messaging.js
index 6f2c54de28..82a85186ba 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -49,7 +49,7 @@ var db = require('./database'),
 				return callback(null, []);
 			}
 
-			user.getMultipleUserFields([fromuid, touid], ['username', 'picture'], function(err, userData) {
+			user.getMultipleUserFields([fromuid, touid], ['username', 'userslug', 'picture'], function(err, userData) {
 				if(err) {
 					return callback(err, null);
 				}
@@ -67,6 +67,7 @@ var db = require('./database'),
 
 						Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], false, function(result) {
 							message.content = result;
+							console.log(message);
 							messages.push(message);
 							next(null);
 						});
@@ -93,10 +94,10 @@ var db = require('./database'),
 				picture;
 
 			if (parseInt(fromuid, 10) === parseInt(myuid, 10)) {
-				picture = '<img class="chat-user-image" src="' + myUserData.picture + '">';
+				picture = '<a href="/user/' + myUserData.userslug + '"><img class="chat-user-image" src="' + myUserData.picture + '"></a>';
 				username = '<span class="chat-user chat-user-you"> '+ myUserData.username + '</span>: ';
 			} else {
-				picture = '<img class="chat-user-image" src="' + toUserData.picture + '">';
+				picture = '<a href="/user/' + toUserData.userslug + '"><img class="chat-user-image" src="' + toUserData.picture + '"></a>';
 				username = '<span class="chat-user"> ' + toUserData.username + '</span>: ';
 			}
 

From 3e92644104f7f641bbc0dadd42ee09b78ba6b71d Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 5 Feb 2014 21:20:31 -0500
Subject: [PATCH 13/16] removed console.log

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

diff --git a/src/messaging.js b/src/messaging.js
index 82a85186ba..775d2467d8 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -67,7 +67,6 @@ var db = require('./database'),
 
 						Messaging.parse(message.content, message.fromuid, fromuid, userData[1], userData[0], false, function(result) {
 							message.content = result;
-							console.log(message);
 							messages.push(message);
 							next(null);
 						});

From a0195ffa32b897a0da9fd3a58958c832045a770f Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Wed, 5 Feb 2014 22:49:10 -0500
Subject: [PATCH 14/16] fixes users online loadmore

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

diff --git a/public/src/forum/users.js b/public/src/forum/users.js
index 378e786e66..f4e9ff988d 100644
--- a/public/src/forum/users.js
+++ b/public/src/forum/users.js
@@ -109,13 +109,13 @@ define(function() {
 
 		function loadMoreUsers() {
 			var set = '';
-			if (active === 'latest' || active === 'users') {
+			if (active === 'latest') {
 				set = 'users:joindate';
 			} else if (active === 'sort-posts') {
 				set = 'users:postcount';
 			} else if (active === 'sort-reputation') {
 				set = 'users:reputation';
-			} else if (active === 'online') {
+			} else if (active === 'online' || active === 'users') {
 				set = 'users:online';
 			}
 

From dedf4add534ececf7e8370258683662396977d64 Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Thu, 6 Feb 2014 00:00:21 -0500
Subject: [PATCH 15/16] better incr for mongo

---
 src/database/mongo.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/database/mongo.js b/src/database/mongo.js
index 9ebc45bd33..86384575bc 100644
--- a/src/database/mongo.js
+++ b/src/database/mongo.js
@@ -415,12 +415,11 @@
 		}
 		field = field.replace(/\./g, '\uff0E');
 		data[field] = value;
-		db.collection('objects').update({_key:key}, {$inc : data}, {upsert:true}, function(err, result) {
-			module.getObjectField(key, field, function(err, value) {
-				if(callback) {
-					callback(err, value);
-				}
-			});
+
+		db.collection('objects').findAndModify({_key:key}, {}, {$inc: data}, {new:true, upsert:true}, function(err, result) {
+			if(callback) {
+				callback(err, result ? result[field] : null);
+			}
 		});
 	}
 

From dc592853fc6689a2a1050a3c9ced70a40430c9da Mon Sep 17 00:00:00 2001
From: Baris Soner Usakli <barisusakli@gmail.com>
Date: Thu, 6 Feb 2014 14:27:37 -0500
Subject: [PATCH 16/16] closes #942

---
 src/webserver.js | 70 ++++++++++++++++++++++++++++++------------------
 1 file changed, 44 insertions(+), 26 deletions(-)

diff --git a/src/webserver.js b/src/webserver.js
index 8e1381c4ef..d1e9174d67 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -514,7 +514,7 @@ module.exports.server = server;
 			});
 		});
 
-		app.get('/topic/:topic_id/:slug?', function (req, res) {
+		app.get('/topic/:topic_id/:slug?', function (req, res, next) {
 			var tid = req.params.topic_id;
 
 			if (tid.match(/^\d+\.rss$/)) {
@@ -531,24 +531,33 @@ module.exports.server = server;
 
 					};
 
-				if (!fs.existsSync(rssPath)) {
-					feed.updateTopic(tid, function (err) {
-						if (err) {
-							res.redirect('/404');
-						} else {
-							loadFeed();
-						}
-					});
-				} else {
-					loadFeed();
-				}
+				ThreadTools.privileges(tid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
+					if(err) {
+						return next(err);
+					}
+
+					if(!privileges.read) {
+						return res.redirect('403');
+					}
+
+					if (!fs.existsSync(rssPath)) {
+						feed.updateTopic(tid, function (err) {
+							if (err) {
+								res.redirect('/404');
+							} else {
+								loadFeed();
+							}
+						});
+					} else {
+						loadFeed();
+					}
+				});
 
 				return;
 			}
 
 			async.waterfall([
 				function(next) {
-					// Check whether this user is allowed to access this topic
 					ThreadTools.privileges(tid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
 						if (!err) {
 							if (!privileges.read) {
@@ -687,7 +696,7 @@ module.exports.server = server;
 			});
 		});
 
-		app.get('/category/:category_id/:slug?', function (req, res) {
+		app.get('/category/:category_id/:slug?', function (req, res, next) {
 			var cid = req.params.category_id;
 
 			if (cid.match(/^\d+\.rss$/)) {
@@ -704,24 +713,33 @@ module.exports.server = server;
 
 					};
 
-				if (!fs.existsSync(rssPath)) {
-					feed.updateCategory(cid, function (err) {
-						if (err) {
-							res.redirect('/404');
-						} else {
-							loadFeed();
-						}
-					});
-				} else {
-					loadFeed();
-				}
+				CategoryTools.privileges(cid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
+					if(err) {
+						return next(err);
+					}
+
+					if(!privileges.read) {
+						return res.redirect('403');
+					}
+
+					if (!fs.existsSync(rssPath)) {
+						feed.updateCategory(cid, function (err) {
+							if (err) {
+								res.redirect('/404');
+							} else {
+								loadFeed();
+							}
+						});
+					} else {
+						loadFeed();
+					}
+				});
 
 				return;
 			}
 
 			async.waterfall([
 				function(next) {
-					// Check whether this user is allowed to access this category
 					CategoryTools.privileges(cid, ((req.user) ? req.user.uid || 0 : 0), function(err, privileges) {
 						if (!err) {
 							if (!privileges.read) {