mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-17 14:00:29 +01:00
Compare commits
20 Commits
socket-not
...
v1.7.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7df191412d | ||
|
|
277e6db409 | ||
|
|
8c9bae8ba3 | ||
|
|
11976b25d7 | ||
|
|
8e61d739c7 | ||
|
|
e099dcf45c | ||
|
|
e16bec61d5 | ||
|
|
dabb1e8d6d | ||
|
|
748067e8c8 | ||
|
|
0020b8a18b | ||
|
|
368c387b6a | ||
|
|
5ff5b6c699 | ||
|
|
9ea1f25814 | ||
|
|
383410ba83 | ||
|
|
c4a8138ded | ||
|
|
a5e5f767ab | ||
|
|
97ac4a2e8c | ||
|
|
6cbeff34ea | ||
|
|
6be3e7cc8c | ||
|
|
87d621d944 |
@@ -2,7 +2,7 @@
|
|||||||
"name": "nodebb",
|
"name": "nodebb",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"description": "NodeBB Forum",
|
"description": "NodeBB Forum",
|
||||||
"version": "1.7.3",
|
"version": "1.7.5",
|
||||||
"homepage": "http://www.nodebb.org",
|
"homepage": "http://www.nodebb.org",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
"nconf": "^0.9.1",
|
"nconf": "^0.9.1",
|
||||||
"nodebb-plugin-composer-default": "6.0.8",
|
"nodebb-plugin-composer-default": "6.0.8",
|
||||||
"nodebb-plugin-dbsearch": "2.0.9",
|
"nodebb-plugin-dbsearch": "2.0.9",
|
||||||
"nodebb-plugin-emoji": "2.0.9",
|
"nodebb-plugin-emoji": "^2.1.0",
|
||||||
"nodebb-plugin-emoji-android": "2.0.0",
|
"nodebb-plugin-emoji-android": "2.0.0",
|
||||||
"nodebb-plugin-markdown": "8.2.2",
|
"nodebb-plugin-markdown": "8.2.2",
|
||||||
"nodebb-plugin-mentions": "2.2.2",
|
"nodebb-plugin-mentions": "2.2.2",
|
||||||
@@ -69,9 +69,6 @@
|
|||||||
"nodebb-plugin-spam-be-gone": "0.5.1",
|
"nodebb-plugin-spam-be-gone": "0.5.1",
|
||||||
"nodebb-rewards-essentials": "0.0.11",
|
"nodebb-rewards-essentials": "0.0.11",
|
||||||
"nodebb-theme-lavender": "5.0.1",
|
"nodebb-theme-lavender": "5.0.1",
|
||||||
"nodebb-theme-persona": "7.2.18",
|
|
||||||
"nodebb-theme-slick": "1.1.4",
|
|
||||||
"nodebb-theme-vanilla": "8.1.8",
|
|
||||||
"nodebb-theme-persona": "7.2.16",
|
"nodebb-theme-persona": "7.2.16",
|
||||||
"nodebb-theme-slick": "1.1.4",
|
"nodebb-theme-slick": "1.1.4",
|
||||||
"nodebb-theme-vanilla": "8.1.7",
|
"nodebb-theme-vanilla": "8.1.7",
|
||||||
@@ -140,4 +137,4 @@
|
|||||||
"url": "https://github.com/barisusakli"
|
"url": "https://github.com/barisusakli"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ define('forum/account/settings', ['forum/account/header', 'components', 'sounds'
|
|||||||
if (skinName === 'default') {
|
if (skinName === 'default') {
|
||||||
skinName = config.defaultBootswatchSkin;
|
skinName = config.defaultBootswatchSkin;
|
||||||
}
|
}
|
||||||
var cssSource = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinName + '/bootstrap.min.css';
|
var cssSource = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinName + '/bootstrap.min.css';
|
||||||
if (css.length) {
|
if (css.length) {
|
||||||
css.attr('href', cssSource);
|
css.attr('href', cssSource);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -10,13 +10,13 @@ var helpers = require('./helpers');
|
|||||||
|
|
||||||
exports.get = function (req, res, callback) {
|
exports.get = function (req, res, callback) {
|
||||||
async.waterfall([
|
async.waterfall([
|
||||||
function (next) {
|
function (_next) {
|
||||||
plugins.fireHook('filter:composer.build', {
|
plugins.fireHook('filter:composer.build', {
|
||||||
req: req,
|
req: req,
|
||||||
res: res,
|
res: res,
|
||||||
next: callback,
|
next: callback,
|
||||||
templateData: {},
|
templateData: {},
|
||||||
}, next);
|
}, _next);
|
||||||
},
|
},
|
||||||
function (data) {
|
function (data) {
|
||||||
if (data.templateData.disabled) {
|
if (data.templateData.disabled) {
|
||||||
|
|||||||
@@ -283,7 +283,7 @@ module.exports = function (middleware) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (skinToUse) {
|
if (skinToUse) {
|
||||||
obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/latest/' + skinToUse + '/bootstrap.min.css';
|
obj.bootswatchCSS = '//maxcdn.bootstrapcdn.com/bootswatch/3.3.7/' + skinToUse + '/bootstrap.min.css';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user