Merge branch 'master' into search-cid-uid

package.json

@@ -45,8 +45,8 @@
     "nodebb-plugin-mentions": "^0.11.0",
     "nodebb-plugin-soundpack-default": "~0.1.1",
     "nodebb-plugin-spam-be-gone": "^0.4.0",
-    "nodebb-theme-lavender": "^1.0.6",
-    "nodebb-theme-vanilla": "^1.0.28",
+    "nodebb-theme-lavender": "^1.0.22",
+    "nodebb-theme-vanilla": "^1.0.65",
     "nodebb-widget-essentials": "~0.2.12",
     "nodebb-rewards-essentials": "^0.0.1",
     "npm": "^2.1.4",

public/src/ajaxify.js

@@ -64,12 +64,12 @@ $(document).ready(function() {
 	ajaxify.handleACPRedirect = function(url) {
 		// If ajaxifying into an admin route from regular site, do a cold load.
 		url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));
-		if (url.indexOf('admin') === 0 && window.location.pathname.indexOf('/admin') !== 0) {
+		if (url.indexOf('admin') === 0 && window.location.pathname.indexOf(RELATIVE_PATH + '/admin') !== 0) {
 			window.open(RELATIVE_PATH + '/' + url, '_blank');
 			return true;
 		}
 		return false;
-	}
+	};
 
 	ajaxify.start = function(url, quiet, search) {
 		url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));

src/categories/create.js

@@ -32,7 +32,7 @@ module.exports = function(Categories) {
 				order: order,
 				link: '',
 				numRecentReplies: 1,
-				class: 'col-md-3 col-xs-6',
+				class: 'col-md-3 col-xs-12',
 				imageClass: 'auto'
 			};
 

src/emailer.js

@@ -62,7 +62,8 @@ var	fs = require('fs'),
 						plaintext: translated[1],
 						template: template,
 						uid: uid,
-						pid: params.pid
+						pid: params.pid,
+						fromUid: params.fromUid
 					});
 					callback();
 				} else {

src/views/partials/requirejs-config.tpl

@@ -0,0 +1,12 @@
+<script>
+	require.config({
+		baseUrl: "{relative_path}/src/modules",
+		waitSeconds: 3,
+		urlArgs: "{cache-buster}",
+		paths: {
+			'forum': '../forum',
+			'vendor': '../../vendor',
+			'mousetrap': '../../bower/mousetrap/mousetrap'
+		}
+	});
+</script>