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

Merge branch 'master' into access

Browse source 
Conflicts:
	config/default.toml
This commit is contained in:
Tomas Bures 2017-05-27 10:43:31 +02:00
commit 115d254baf
33 changed files with 2331 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

27
config/default.toml
View file

@ -110,16 +110,6 @@ host="0.0.0.0"
# VERP hostname is in the same domain as the From address.
# disablesenderheader=true
[testserver]
# Starts a vanity server that redirects all mail to /dev/null
# Mostly needed for local development
enabled=false
port=5587
host="0.0.0.0"
username="testuser"
password="testpass"
logger=false
[ldap]
# enable to use ldap user backend
enabled=false
@ -178,17 +168,30 @@ templates=[["demo", "Demo Template"]]
# then it's safer to switch off the reporting functionality below.
enabled=false
[testserver]
# Starts a vanity server that redirects all mail to /dev/null
# Mostly needed for local development
enabled=false
port=5587
mailboxserverport=3001
host="0.0.0.0"
username="testuser"
password="testpass"
logger=false
[seleniumwebdriver]
browser="phantomjs"
[shares.list.master]
name="Master"
description="All permissions"
permissions=["view"]
[shares.namespace.master]
name="Master"
description="All permissions"
[shares.namespace.master.permissions]
list=["view"]
namespace=["view", "edit", "create", "delete", "create list"]
namespace=["view", "edit", "create", "delete", "create list"]