public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'pull/564' into development

Browse source
This commit is contained in:
Tomas Bures 2019-03-26 22:55:00 +01:00
commit dcb7168322
24 changed files with 1216 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

3
server/config/default.yaml
View file

@ -42,6 +42,7 @@ defaultLanguage: en-US
# Enabled languages
enabledLanguages:
- en-US
- es-ES
- fk-FK
# Inject custom scripts in subscription/layout.mjml.hbs
@ -230,7 +231,7 @@ roles:
name: Global Master
admin: true
description: All permissions
permissions: [rebuildPermissions, createJavascriptWithROAccess, manageBlacklist, manageSettings, setupAutomation]
permissions: [rebuildPermissions, createJavascriptWithROAccess, manageUserList, manageBlacklist, manageSettings, setupAutomation]
rootNamespaceRole: master
campaignsAdmin:
name: Campaigns Admin