Merge branch 'master' of https://github.com/NodeBB/NodeBB

Conflicts:
	src/groups.js

public/src/ajaxify.js

@@ -289,13 +289,12 @@ var ajaxify = ajaxify || {};
 					}
 				} else if (window.location.pathname !== '/outgoing') {
 					// External Link
-
-					if (config.useOutgoingLinksPage) {
-						ajaxify.go('outgoing?url=' + encodeURIComponent(this.href));
-						e.preventDefault();
-					} else if (config.openOutgoingLinksInNewTab) {
+					if (config.openOutgoingLinksInNewTab) {
 						window.open(this.href, '_blank');
 						e.preventDefault();
+					} else if (config.useOutgoingLinksPage) {
+						ajaxify.go('outgoing?url=' + encodeURIComponent(this.href));
+						e.preventDefault();
 					}
 				}
 			}

public/src/forum/topic.js

@@ -42,8 +42,7 @@ define('forum/topic', dependencies, function(pagination, infinitescroll, threadT
 
 		app.enterRoom('topic_' + tid);
 
-		browsing.populateOnlineUsers();
-		$('.post-content img').addClass('img-responsive');
+		processPage($('.topic'));
 
 		showBottomPostBar();
 
@@ -334,13 +333,19 @@ define('forum/topic', dependencies, function(pagination, infinitescroll, threadT
 			getPostPrivileges(posts[x].pid);
 		}
 
+		processPage(html);
+	}
+
+	function processPage(element) {
 		browsing.populateOnlineUsers();
 		app.createUserTooltips();
-		app.replaceSelfLinks(html.find('a'));
-		utils.addCommasToNumbers(html.find('.formatted-number'));
-		utils.makeNumbersHumanReadable(html.find('.human-readable-number'));
-		html.find('span.timeago').timeago();
-		html.find('.post-content img').addClass('img-responsive');
+		app.replaceSelfLinks(element.find('a'));
+		utils.addCommasToNumbers(element.find('.formatted-number'));
+		utils.makeNumbersHumanReadable(element.find('.human-readable-number'));
+		element.find('span.timeago').timeago();
+		element.find('.post-content img:not(.emoji)').addClass('img-responsive').each(function() {
+			$(this).wrap('<a href="' + $(this).attr('src') + '" target="_blank">');
+		});
 		postTools.updatePostCount();
 		showBottomPostBar();
 	}

src/groups.js

@@ -16,6 +16,9 @@
 				// Remove system, hidden, or deleted groups from this list
 				if (groups && !options.showAllGroups) {
 					return groups.filter(function (group) {
+						if (!group) {
+							return false;
+						}
 						if (group.deleted || (group.hidden && !group.system) || (!options.showSystemGroups && group.system)) {
 							return false;
 						} else if (options.removeEphemeralGroups && ephemeralGroups.indexOf(group.name) !== -1) {
@@ -57,6 +60,9 @@
 
 	Groups.list = function(options, callback) {
 		db.getSetMembers('groups', function (err, groupNames) {
+			if (err) {
+				return callback(err);
+			}
 			groupNames = groupNames.concat(ephemeralGroups);
 
 			async.map(groupNames, function (groupName, next) {
@@ -296,8 +302,16 @@
 					},
 					function(next) {
 						Groups.exists('group:' + oldName + ':members', function(err, exists) {
+<<<<<<< HEAD
 							if (exists) {
 								db.rename('group:' + oldName + ':members', 'group:' + newName + ':members', next);							
+=======
+							if (err) {
+								return next(err);
+							}
+							if (exists) {
+								db.rename('group:' + oldName + ':members', 'group:' + newName + ':members', next);
+>>>>>>> aa4089e6d78b6412bae1274bfa0c20bbb754c054
 							} else {
 								next();
 							}

src/install.js

@@ -176,6 +176,9 @@ function setupConfig(next) {
 }
 
 function completeConfigSetup(err, config, next) {
+	if (err) {
+		return next(err);
+	}
 	// Add CI object
 	if (install.ciVals) {
 		config.test_database = {};

src/user/email.js

@@ -49,9 +49,10 @@ var async = require('async'),
 						return winston.error(err.message);
 					}
 
-					translator.translate('[[email:welcome-to, ' + (meta.config.title || 'NodeBB') + ']]', meta.config.defaultLang, function(subject) {
+					var title = meta.config.title || meta.config.browserTitle || 'NodeBB';
+					translator.translate('[[email:welcome-to, ' + title + ']]', meta.config.defaultLang, function(subject) {
 						var data = {
-							site_title: (meta.config.title || 'NodeBB'),
+							site_title: title,
 							username: username,
 							confirm_link: confirm_link,
 							confirm_code: confirm_code,