From a3f167bfd24811ea6e062856da65fe1bdc1a6256 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Mon, 16 Mar 2015 13:49:47 -0400 Subject: [PATCH 1/6] default category should be col-xs-12 --- src/categories/create.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/categories/create.js b/src/categories/create.js index ce293d1c42..0db3cad0c3 100644 --- a/src/categories/create.js +++ b/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' }; From 0f59046392f71d6e23feed39490ba8dad9baa4fa Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Mon, 16 Mar 2015 16:35:22 -0400 Subject: [PATCH 2/6] added requirejs config partial, #2875 --- src/views/partials/requirejs-config.tpl | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/views/partials/requirejs-config.tpl diff --git a/src/views/partials/requirejs-config.tpl b/src/views/partials/requirejs-config.tpl new file mode 100644 index 0000000000..932c571f4a --- /dev/null +++ b/src/views/partials/requirejs-config.tpl @@ -0,0 +1,12 @@ + \ No newline at end of file From b83aa108f22e98cb2bcc62fb18504522a1e494be Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 10:47:02 -0400 Subject: [PATCH 3/6] requiring more recent vanilla and lavender dependencies, #2875 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 1877079d6f..4f56cc91e1 100644 --- a/package.json +++ b/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", From 521c454dde71cdde24327b14b1473aa554b4feeb Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 11:29:19 -0400 Subject: [PATCH 4/6] updated emailer to pass through "fromUid" if available --- src/emailer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emailer.js b/src/emailer.js index b358e170fb..aeca1ecab8 100644 --- a/src/emailer.js +++ b/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 { From 9fc97ce92d24f22cf6f73776b1bcc22737ac6242 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 12:01:55 -0400 Subject: [PATCH 5/6] fixing handleACPRedirect on subfolder installs --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 6178587423..809d2d9db9 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -64,7 +64,7 @@ $(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; } From 406126536a4117d558cf06428ad20f5a541e03c2 Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 17 Mar 2015 12:02:33 -0400 Subject: [PATCH 6/6] missing semicolon --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index 809d2d9db9..75e341643e 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -69,7 +69,7 @@ $(document).ready(function() { return true; } return false; - } + }; ajaxify.start = function(url, quiet, search) { url = ajaxify.removeRelativePath(url.replace(/\/$/, ''));