Merge branch 'master' into temp-bans

v1.18.x
Julian Lam 9 years ago
commit 585a90db5d

@ -54,7 +54,7 @@
"nodebb-plugin-markdown": "6.0.0",
"nodebb-plugin-mentions": "1.1.2",
"nodebb-plugin-soundpack-default": "0.1.6",
"nodebb-plugin-spam-be-gone": "0.4.8",
"nodebb-plugin-spam-be-gone": "0.4.9",
"nodebb-rewards-essentials": "0.0.8",
"nodebb-theme-lavender": "3.0.13",
"nodebb-theme-persona": "4.1.3",

@ -61,14 +61,14 @@ var async = require('async'),
plugins.fireHook('static:app.reload', {}, next);
},
async.apply(plugins.clearRequireCache),
async.apply(plugins.reload),
async.apply(plugins.reloadRoutes),
async.apply(Meta.css.minify),
async.apply(Meta.js.minify, 'nodebb.min.js'),
async.apply(Meta.js.minify, 'acp.min.js'),
async.apply(Meta.sounds.init),
async.apply(languages.init),
async.apply(Meta.templates.compile),
async.apply(plugins.reload),
async.apply(plugins.reloadRoutes),
async.apply(auth.reloadRoutes),
function(next) {
Meta.config['cache-buster'] = utils.generateUUID();

Loading…
Cancel
Save