Compare commits

...

16 Commits

Author SHA1 Message Date
Misty (Bot)
8e61d739c7 Incremented version number - v1.7.4 2018-01-24 21:14:43 +00:00
Misty (Bot)
e099dcf45c Merge commit '813fdaf6f6b8cefa4fd7336d8888af9aefa01905' into v1.7.x 2018-01-24 21:14:43 +00:00
Peter Jaszkowiak
e16bec61d5 Hotfix for #6237 2018-01-15 13:03:43 -07:00
Julian Lam
dabb1e8d6d bump persona 2018-01-03 12:50:47 -05:00
Julian Lam
748067e8c8 updated upgrade logic to not break ACP restart flow 2018-01-02 14:55:15 -05:00
Misty (Bot)
0020b8a18b Incremented version number - v1.7.3 2017-12-27 21:48:01 +00:00
Misty (Bot)
368c387b6a Merge commit 'f9202aeb05d4f12ec92881737ae31cb702a523df' into v1.7.x 2017-12-27 21:48:01 +00:00
Barış Soner Uşaklı
5ff5b6c699 revert _ sluggify change 2017-12-06 21:28:30 -05:00
Misty (Bot)
9ea1f25814 Incremented version number - v1.7.2 2017-12-06 20:18:52 +00:00
Misty (Bot)
383410ba83 Merge commit '94e8b2b38d588698fcaf3e1c856c2e65476aac53' into v1.7.x 2017-12-06 20:18:51 +00:00
Misty (Bot)
c4a8138ded Incremented version number - 1.7.1 2017-11-29 20:38:53 +00:00
Misty (Bot)
a5e5f767ab Merge commit 'a19537dc25e406a98048a561f45b3b321c9d3509' into v1.7.x 2017-11-29 20:38:03 +00:00
Barış Soner Uşaklı
97ac4a2e8c backport composer route crash fix 2017-11-23 18:59:18 -05:00
Julian Lam
6cbeff34ea v1.7.0 compatibility for slick theme 2017-11-21 11:32:36 -05:00
Misty (Bot)
6be3e7cc8c Merge branch 'master' into v1.7.x 2017-11-15 20:00:48 +00:00
Misty (Bot)
87d621d944 Incremented version number - v1.7.0 2017-11-15 19:00:47 +00:00
2 changed files with 39 additions and 42 deletions

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPL-3.0",
"description": "NodeBB Forum",
"version": "1.7.3",
"version": "1.7.4",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",
@@ -69,9 +69,6 @@
"nodebb-plugin-spam-be-gone": "0.5.1",
"nodebb-rewards-essentials": "0.0.11",
"nodebb-theme-lavender": "5.0.1",
"nodebb-theme-persona": "7.2.18",
"nodebb-theme-slick": "1.1.4",
"nodebb-theme-vanilla": "8.1.8",
"nodebb-theme-persona": "7.2.16",
"nodebb-theme-slick": "1.1.4",
"nodebb-theme-vanilla": "8.1.7",

View File

@@ -10,13 +10,13 @@ var helpers = require('./helpers');
exports.get = function (req, res, callback) {
async.waterfall([
function (next) {
function (_next) {
plugins.fireHook('filter:composer.build', {
req: req,
res: res,
next: callback,
templateData: {},
}, next);
}, _next);
},
function (data) {
if (data.templateData.disabled) {