Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-31 04:16:13 +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
2018-01-11 15:27:01 -05:00
parent ec07247854 f4feba94e3
commit f37b9d786d
360 changed files with 1451 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cli/index.js
View File

@@ -6,13 +6,11 @@ var path = require('path');
var packageInstall = require('./package-install');
var dirname = require('./paths').baseDir;
var defaultPackage;
// check to make sure dependencies are installed
try {
defaultPackage = JSON.parse(fs.readFileSync(path.join(dirname, 'install/package.json'), 'utf8'));
require('../../package.json');
} catch (e) {
if (e.code === 'ENOENT') {
if (e.code === 'MODULE_NOT_FOUND') {
console.warn('package.json not found.');
console.log('Populating package.json...');
@@ -32,6 +30,7 @@ try {
try {
var semver = require('semver');
var defaultPackage = require('../../install/package.json');
var checkVersion = function (packageName) {
var version = JSON.parse(fs.readFileSync(path.join(dirname, 'node_modules', packageName, 'package.json'), 'utf8')).version;

2
src/messaging/notifications.js
View File

@@ -76,7 +76,7 @@ module.exports = function (Messaging) {
notifications.create({
type: 'new-chat',
subject: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
subject: '[[email:notif.chat.subject, ' + messageObj.fromUser.username + ']]',
bodyShort: '[[notifications:new_message_from, ' + messageObj.fromUser.username + ']]',
bodyLong: messageObj.content,
nid: 'chat_' + fromuid + '_' + roomId,

2
src/topics/tags.js
View File

@@ -2,6 +2,7 @@
'use strict';
var async = require('async');
var validator = require('validator');
var db = require('../database');
var meta = require('../meta');
@@ -191,6 +192,7 @@ module.exports = function (Topics) {
},
function (tagData, next) {
tags.forEach(function (tag, index) {
tag.valueEscaped = validator.escape(String(tag.value));
tag.color = tagData[index] ? tagData[index].color : '';
tag.bgColor = tagData[index] ? tagData[index].bgColor : '';
});

4
src/user/search.js
View File

@@ -81,6 +81,10 @@ module.exports = function (User) {
}
function filterAndSortUids(uids, data, callback) {
uids = uids.filter(function (uid) {
return parseInt(uid, 10);
});
var fields = [];
if (data.sortBy) {

2
src/views/admin/manage/users.tpl
View File

@@ -47,7 +47,7 @@
<div class="search {search_display}">
<label>[[admin/manage/users:search.uid]]</label>
<input class="form-control" id="search-user-uid" data-search-type="uid" type="text" placeholder="[[admin/manage/users:search.uid-placeholder]]"/><br />
<input class="form-control" id="search-user-uid" data-search-type="uid" type="number" placeholder="[[admin/manage/users:search.uid-placeholder]]"/><br />
<label>[[admin/manage/users:search.username]]</label>
<input class="form-control" id="search-user-name" data-search-type="username" type="text" placeholder="[[admin/manage/users:search.username-placeholder]]"/><br />