Merge remote-tracking branch 'origin/master' into user-blocking

This commit is contained in:
Julian Lam
2018-04-27 10:55:50 -04:00
2 changed files with 2 additions and 1 deletions

View File

@@ -63,7 +63,7 @@
"mousetrap": "^1.6.1",
"mubsub": "^1.4.0",
"nconf": "^0.9.1",
"nodebb-plugin-composer-default": "6.0.21",
"nodebb-plugin-composer-default": "6.0.22",
"nodebb-plugin-dbsearch": "2.0.16",
"nodebb-plugin-emoji": "^2.2.0",
"nodebb-plugin-emoji-android": "2.0.0",

View File

@@ -79,6 +79,7 @@ module.exports = function (Categories) {
async.apply(privileges.categories.give, defaultPrivileges, category.cid, 'administrators'),
async.apply(privileges.categories.give, defaultPrivileges, category.cid, 'registered-users'),
async.apply(privileges.categories.give, ['find', 'read', 'topics:read'], category.cid, 'guests'),
async.apply(privileges.categories.give, ['find', 'read', 'topics:read'], category.cid, 'spiders'),
], next);
},
function (results, next) {