Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-30 18:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	public/src/admin/extend/plugins.js
This commit is contained in:
Baris Usakli
2017-08-11 11:33:06 -04:00
parent d9ad26c7c5 24bbf8fe00
commit bc6b1a8f56
164 changed files with 1042 additions and 720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins.js
View File

@@ -265,6 +265,7 @@ Plugins.normalise = function (apiReturn, callback) {
pluginMap[plugin.id].active = plugin.active;
pluginMap[plugin.id].version = plugin.version;
pluginMap[plugin.id].settingsRoute = plugin.settingsRoute;
pluginMap[plugin.id].license = plugin.license;
// If package.json defines a version to use, stick to that
if (dependencies.hasOwnProperty(plugin.id) && semver.valid(dependencies[plugin.id])) {