Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-18 02:20:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-04-12 23:57:14 -04:00
parent 484a800327 c3febca9c8
commit d18cfced96
226 changed files with 211 additions and 10501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/admin/categories.js
View File

@@ -6,7 +6,7 @@ var categories = require('../../categories');
var privileges = require('../../privileges');
var analytics = require('../../analytics');
var plugins = require('../../plugins');
var translator = require('../../../public/src/modules/translator');
var translator = require('../../translator');
var categoriesController = {};

4
src/controllers/admin/settings.js
View File

@@ -24,13 +24,13 @@ settingsController.get = function (req, res, next) {
function renderEmail(req, res, next) {
var fs = require('fs');
var path = require('path');
var utils = require('../../../public/src/utils');
var file = require('../../file');
var emailsPath = path.join(nconf.get('views_dir'), 'emails');
async.waterfall([
function (next) {
utils.walk(emailsPath, next);
file.walk(emailsPath, next);
},
function (emails, next) {
async.map(emails, function (email, next) {