paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

emails: Add option to forward mails send in dev env to external email.

Browse Source 
Fixes #7085.
This commit is contained in:
Vishnu Ks
2017-10-24 23:58:05 +00:00
committed by Tim Abbott
parent ac763d6eed
commit 36f29764cb
9 changed files with 246 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
templates/zerver/config_error.html
View File

@@ -19,20 +19,29 @@
{% endif %}
{% if smtp_error %}
<p>
It appears there are problems with the
email configuration.
</p>
<p>
See <code>/var/log/zulip/errors.log</code> for more
details on the error.
</p>
<p>
You may also want to test your email configuration,
as described in the
<a href="https://zulip.readthedocs.io/en/latest/prod-email.html">
Production installation docs</a>.
</p>
<p>
It appears there are problems with the
email configuration.
</p>
{% if not development_environment %}
<p>
See <code>/var/log/zulip/errors.log</code> for more
details on the error.
</p>
<p>
You may also want to test your email configuration,
as described in the
<a href="https://zulip.readthedocs.io/en/latest/prod-email.html">
Production installation docs</a>.
</p>
{% else %}
<p>
Please have a look at our
<a target="_blank" href="https://zulip.readthedocs.io/en/latest/email.html#development-and-testing">
setup guide</a> for forwarding emails sent in development
environment to an email account.
</p>
{% endif %}
{% endif %}
{% if google_error %}
@@ -43,22 +52,24 @@
{{ render_markdown_path('zerver/github-error.md', {"root_domain_uri": root_domain_uri, "settings_path": settings_path, "secrets_path": secrets_path}) }}
{% endif %}
{% if google_error or github_error %}
{% if development_environment %}
<p>
For more information, have a look at
the <a href="http://zulip.readthedocs.io/en/latest/settings.html#testing-google-github-authentication">authentication
setup guide</a> for the development environment.
</p>
{% else %}
<p>
For more information, have a look at
our <a href="http://zulip.readthedocs.io/en/latest/prod-authentication-methods.html">authentication
setup guide</a> and the comments in <code>{{ settings_comments_path }}</code>.
</p>
{% endif %}
{% endif %}
<p>After making your changes, remember to restart
the Zulip server.</p>
{% if development %}
<p>
For more information, have a look at
the <a href="http://zulip.readthedocs.io/en/latest/settings.html#testing-google-github-authentication">authentication
setup guide</a> for the development environment.
</p>
{% else %}
<p>
For more information, have a look at
our <a href="http://zulip.readthedocs.io/en/latest/prod-authentication-methods.html">authentication
setup guide</a> and the comments in <code>{{ settings_comments_path }}</code>.
</p>
{% endif %}
</div>
</div>