mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-17 14:00:29 +01:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
accee7d05b | ||
|
|
f403a297b4 | ||
|
|
73e7da6f03 | ||
|
|
9c1b24c963 |
2610
npm-shrinkwrap.json
generated
Normal file
2610
npm-shrinkwrap.json
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -2,7 +2,7 @@
|
|||||||
"name": "nodebb",
|
"name": "nodebb",
|
||||||
"license": "GPLv3 or later",
|
"license": "GPLv3 or later",
|
||||||
"description": "NodeBB Forum",
|
"description": "NodeBB Forum",
|
||||||
"version": "0.6.0-dev",
|
"version": "0.6.0",
|
||||||
"homepage": "http://www.nodebb.org",
|
"homepage": "http://www.nodebb.org",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ var apiController = {};
|
|||||||
apiController.getConfig = function(req, res, next) {
|
apiController.getConfig = function(req, res, next) {
|
||||||
var config = {};
|
var config = {};
|
||||||
config.relative_path = nconf.get('relative_path');
|
config.relative_path = nconf.get('relative_path');
|
||||||
config.socketioTransports = nconf.get('socket.io:transports') || ['websocket', 'polling'];
|
config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket'];
|
||||||
config.websocketAddress = nconf.get('socket.io:address') || '';
|
config.websocketAddress = nconf.get('socket.io:address') || '';
|
||||||
config.version = pkg.version;
|
config.version = pkg.version;
|
||||||
config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB';
|
config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB';
|
||||||
|
|||||||
@@ -59,7 +59,9 @@ module.exports = function(redisClient, module) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
module.sortedSetsRemove = function(keys, value, callback) {
|
module.sortedSetsRemove = function(keys, value, callback) {
|
||||||
multi('zrem', keys, value, callback);
|
multi('zrem', keys, value, function(err) {
|
||||||
|
callback(err);
|
||||||
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
module.sortedSetsRemoveRangeByScore = function(keys, min, max, callback) {
|
module.sortedSetsRemoveRangeByScore = function(keys, min, max, callback) {
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ Sockets.init = function(server) {
|
|||||||
io.on('connection', onConnection);
|
io.on('connection', onConnection);
|
||||||
|
|
||||||
io.listen(server, {
|
io.listen(server, {
|
||||||
transports: nconf.get('socket.io:transports') || ['websocket', 'polling']
|
transports: nconf.get('socket.io:transports')
|
||||||
});
|
});
|
||||||
|
|
||||||
Sockets.server = io;
|
Sockets.server = io;
|
||||||
|
|||||||
Reference in New Issue
Block a user