diff --git a/.gitignore b/.gitignore index 42a1b3c70..0d741b9e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,16 @@ dist/ yarn.lock npm-debug.log -node_modules/ +node_modules/* +!/node_modules/nodebb-plugin-composer-default +/node_modules/nodebb-plugin-composer-default/* +!/node_modules/nodebb-plugin-composer-default/static/ +/node_modules/nodebb-plugin-composer-default/static/* +!/node_modules/nodebb-plugin-composer-default/static/templates/ +/node_modules/nodebb-plugin-composer-default/static/templates/* +!/node_modules/nodebb-plugin-composer-default/static/templates/partials/ +/node_modules/nodebb-plugin-composer-default/static/templates/partials/* +!/node_modules/nodebb-plugin-composer-default/static/templates/partials/composer-formatting.tpl sftp-config.json config.json jsconfig.json diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 000000000..2300e131a Binary files /dev/null and b/dump.rdb differ diff --git a/public/language/en-US/admin/manage/categories.json b/public/language/en-US/admin/manage/categories.json index 8a9ff471b..816d980ad 100644 --- a/public/language/en-US/admin/manage/categories.json +++ b/public/language/en-US/admin/manage/categories.json @@ -32,6 +32,8 @@ "optional-clone-settings": "(Optional) Clone Settings From Category", "clone-children": "Clone Children Categories And Settings", "purge": "Purge Category", + "upload-files": "Upload Files", + "create-poll": "Create Poll", "enable": "Enable", "disable": "Disable", diff --git a/public/language/en-US/admin/manage/privileges.json b/public/language/en-US/admin/manage/privileges.json index 240cff6aa..9944b07e2 100644 --- a/public/language/en-US/admin/manage/privileges.json +++ b/public/language/en-US/admin/manage/privileges.json @@ -11,6 +11,7 @@ "chat-with-privileged": "Chat with Privileged", "upload-images": "Upload Images", "upload-files": "Upload Files", + "create-poll": "Create Poll", "signature": "Signature", "ban": "Ban", "mute": "Mute", diff --git a/public/language/en-US/global.json b/public/language/en-US/global.json index 33ab34e59..c9a1a6a76 100644 --- a/public/language/en-US/global.json +++ b/public/language/en-US/global.json @@ -128,6 +128,7 @@ "ip-address": "IP Address", "enter-page-number": "Enter page number", "upload-file": "Upload file", + "create-poll": "Create Poll", "upload": "Upload", "uploads": "Uploads", "allowed-file-types": "Allowed file types are %1", diff --git a/public/language/en-US/modules.json b/public/language/en-US/modules.json index 3bc454ffd..4609d9269 100644 --- a/public/language/en-US/modules.json +++ b/public/language/en-US/modules.json @@ -102,6 +102,7 @@ "composer.upload-picture": "Upload Image", "composer.upload-file": "Upload File", "composer.zen-mode": "Zen Mode", + "composer.create-poll": "Create Poll", "composer.select-category": "Select a category", "composer.textarea.placeholder": "Enter your post content here, drag and drop images", "composer.post-queue-alert": "Hellođź‘‹!
This forum uses a post queue system, since you are a new user your post will be hidden until it is approved by our moderation team.", diff --git a/src/install.js b/src/install.js index 40a59aa25..0ea7ec4ea 100644 --- a/src/install.js +++ b/src/install.js @@ -454,9 +454,10 @@ async function giveGlobalPrivileges() { await privileges.global.give(defaultPrivileges.concat(['groups:view:users:info']), 'Instructors'); console.log('===000===000===GAVE INSTRUCTORS PERMS'); await privileges.global.give(defaultPrivileges.concat([ - 'groups:ban', 'groups:upload:post:file']), 'Global Moderators'); - await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups'], 'guests'); - await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups'], 'spiders'); + 'groups:ban', 'groups:upload:post:file', 'create-poll']), 'Global Moderators'); + await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups', 'create-poll'], 'guests'); + await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:view:groups', 'create-poll'], 'spiders'); + await privileges.global.give(['groups:view:users', 'groups:view:tags', 'groups:upload:post:file', 'groups:view:groups', 'create-poll'], 'Instructors'); } async function createCategories() {