Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-30 11:07:15 +02: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

4
src/user/approval.js
View File

@@ -9,8 +9,8 @@ var meta = require('../meta');
var emailer = require('../emailer');
var notifications = require('../notifications');
var groups = require('../groups');
var translator = require('../../public/src/modules/translator');
var utils = require('../../public/src/utils');
var translator = require('../translator');
var utils = require('../utils');
var plugins = require('../plugins');
module.exports = function (User) {

2
src/user/create.js
View File

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

2
src/user/data.js
View File

@@ -7,7 +7,7 @@ var winston = require('winston');
var db = require('../database');
var plugins = require('../plugins');
var utils = require('../../public/src/utils');
var utils = require('../utils');
module.exports = function (User) {
var iconBackgrounds = ['#f44336', '#e91e63', '#9c27b0', '#673ab7', '#3f51b5', '#2196f3',

2
src/user/digest.js
View File

@@ -10,7 +10,7 @@ var user = require('../user');
var topics = require('../topics');
var plugins = require('../plugins');
var emailer = require('../emailer');
var utils = require('../../public/src/utils');
var utils = require('../utils');
(function (Digest) {
Digest.execute = function (interval, callback) {

4
src/user/email.js
View File

@@ -5,8 +5,8 @@ var async = require('async');
var nconf = require('nconf');
var user = require('../user');
var utils = require('../../public/src/utils');
var translator = require('../../public/src/modules/translator');
var utils = require('../utils');
var translator = require('../translator');
var plugins = require('../plugins');
var db = require('../database');
var meta = require('../meta');

4
src/user/invite.js
View File

@@ -7,8 +7,8 @@ var nconf = require('nconf');
var db = require('./../database');
var meta = require('../meta');
var emailer = require('../emailer');
var translator = require('../../public/src/modules/translator');
var utils = require('../../public/src/utils');
var translator = require('../translator');
var utils = require('../utils');
module.exports = function (User) {

2
src/user/profile.js
View File

@@ -4,7 +4,7 @@
var async = require('async');
var S = require('string');
var utils = require('../../public/src/utils');
var utils = require('../utils');
var meta = require('../meta');
var db = require('../database');
var groups = require('../groups');

4
src/user/reset.js
View File

@@ -5,8 +5,8 @@ var nconf = require('nconf');
var winston = require('winston');
var user = require('../user');
var utils = require('../../public/src/utils');
var translator = require('../../public/src/modules/translator');
var utils = require('../utils');
var translator = require('../translator');
var db = require('../database');
var meta = require('../meta');