forked from github/plane
Merge branch 'feat/self_hosted_instance' of github.com:makeplane/plane into develop-deploy
This commit is contained in:
commit
e7e7065d32
@ -42,7 +42,6 @@ def email_verification(first_name, email, token, current_site):
|
|||||||
username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
|
username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
|
||||||
password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
|
password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
|
||||||
use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
|
use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
|
||||||
use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Initiate email alternatives
|
# Initiate email alternatives
|
||||||
|
@ -39,7 +39,6 @@ def forgot_password(first_name, email, uidb64, token, current_site):
|
|||||||
username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
|
username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
|
||||||
password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
|
password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
|
||||||
use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
|
use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
|
||||||
use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")),
|
|
||||||
)
|
)
|
||||||
# Initiate email alternatives
|
# Initiate email alternatives
|
||||||
msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection)
|
msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection)
|
||||||
|
@ -53,7 +53,6 @@ def project_invitation(email, project_id, token, current_site, invitor):
|
|||||||
username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
|
username=get_configuration_value(instance_configuration, "EMAIL_HOST_USER"),
|
||||||
password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
|
password=get_configuration_value(instance_configuration, "EMAIL_HOST_PASSWORD"),
|
||||||
use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
|
use_tls=bool(get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")),
|
||||||
use_ssl=bool(get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")),
|
|
||||||
)
|
)
|
||||||
# Initiate email alternatives
|
# Initiate email alternatives
|
||||||
msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection)
|
msg = EmailMultiAlternatives(subject=subject, body=text_content, from_email=get_configuration_value(instance_configuration, "EMAIL_FROM"), to=[email], connection=connection)
|
||||||
|
@ -69,9 +69,6 @@ def workspace_invitation(email, workspace_id, token, current_site, invitor):
|
|||||||
use_tls=bool(
|
use_tls=bool(
|
||||||
get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")
|
get_configuration_value(instance_configuration, "EMAIL_USE_TLS", "1")
|
||||||
),
|
),
|
||||||
use_ssl=bool(
|
|
||||||
get_configuration_value(instance_configuration, "EMAIL_USE_SSL", "0")
|
|
||||||
),
|
|
||||||
)
|
)
|
||||||
# Initiate email alternatives
|
# Initiate email alternatives
|
||||||
msg = EmailMultiAlternatives(
|
msg = EmailMultiAlternatives(
|
||||||
|
Loading…
Reference in New Issue
Block a user