Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-06 20:41:17 +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/groups/create.js
View File

@@ -3,7 +3,7 @@
var async = require('async');
var meta = require('../meta');
var plugins = require('../plugins');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var db = require('../database');
module.exports = function (Groups) {

2
src/groups/data.js
View File

@@ -5,7 +5,7 @@ var validator = require('validator');
var db = require('../database');
var plugins = require('../plugins');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (Groups) {
Groups.getGroupsData = function (groupNames, callback) {

2
src/groups/delete.js
View File

@@ -2,7 +2,7 @@
var async = require('async');
var plugins = require('../plugins');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var db = require('./../database');
module.exports = function (Groups) {

2
src/groups/membership.js
View File

@@ -5,7 +5,7 @@ var winston = require('winston');
var _ = require('underscore');
var user = require('../user');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var plugins = require('../plugins');
var notifications = require('../notifications');
var db = require('../database');

2
src/groups/update.js
View File

@@ -4,7 +4,7 @@ var async = require('async');
var winston = require('winston');
var plugins = require('../plugins');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var db = require('../database');