Merge branch 'master' into user-blocking

This commit is contained in:
Julian Lam
2018-04-27 15:58:04 -04:00
65 changed files with 1258 additions and 153 deletions

View File

@@ -68,6 +68,17 @@ helpers.getUserDataByUserSlug = function (userslug, callerUID, callback) {
globalMod: true,
admin: true,
},
}, {
id: 'consent',
route: 'consent',
name: '[[user:consent.title]]',
visibility: {
self: true,
other: false,
moderator: false,
globalMod: false,
admin: false,
},
}],
}, next);
},