Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

integrations doc: Move email doc to separate file.

This commit is contained in:
Tomasz Kolek 2017-04-05 07:09:55 +02:00 committed by Tim Abbott
parent 3c0287cfc7
commit d1b4a4546d
3 changed files with 35 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
templates/zerver/integrations/email.html Normal file
View File

@ -0,0 +1,31 @@
<p>You can send emails to Zulip! This is useful:</p>
<ul>
<li>If you use a service that can send emails but does not easily lend
itself to more direct integration
</li>
<li>If you have an email that you want to discuss on Zulip</li>
<li>As a structured, searchable, commentable archive for mailing list
traffic
</li>
</ul>
<p>To send an email to a Zulip stream:</p>
<ol>
<li>Visit your {{ subscriptions_html|safe }} and click on the stream row to expand it.</li>
<li>Copy the stream email address
(e.g. <code>{{ email_gateway_example }}</code>). If the stream
name contains special characters, we've transformed the name so it is a
safe email recipient.
</li>
<li>Send an email (To, CC, and BCC all work) to the stream email
address. The email subject will become the stream topic, and the email
body will become the Zulip message content.
</li>
</ol>
<p>
Please note that it may take up to one minute for the message to show up
in Zulip.
</p>

42
templates/zerver/integrations/index.html
View File

@ -112,45 +112,9 @@
{% endif %}
{% endfor %}
{% if email_integration_enabled %}
<div id="email" class="integration-instructions">
<p>You can send emails to Zulip! This is useful:</p>
<ul>
<li>If you use a service that can send emails but does not easily lend
itself to more direct integration</li>
<li>If you have an email that you want to discuss on Zulip</li>
<li>As a structured, searchable, commentable archive for mailing list
traffic</li>
</ul>
<p>To send an email to a Zulip stream:</p>
<ol>
<li>Visit your {{ subscriptions_html|safe }} and click on the stream row to expand it.</li>
<li>Copy the stream email address
(e.g. <code>{{ email_gateway_example }}</code>). If the stream
name contains special characters, we've transformed the name so it is a
safe email recipient.</li>
<li>Send an email (To, CC, and BCC all work) to the stream email
address. The email subject will become the stream topic, and the email
body will become the Zulip message content.</li>
</ol>
<p>Please note that it may take up to one minute for the message to show up
in Zulip.</p>
<p style="font-size:11px; font-style:italic;">
Logos are trademarks of their respective owners.
None of the integrations on this page are created by,
affiliated with, or supported by the companies
represented by the logos.
</p>
</div>
{% endif %}
{% if email_integration_enabled %}
{% include 'zerver/integrations/email.html' %}
{% endif %}
<div id="git" class="integration-instructions">

2
zerver/lib/integrations.py
View File

@ -186,7 +186,7 @@ INTEGRATIONS = {
'asana': Integration('asana', 'asana', doc='zerver/integrations/asana.html'),
'capistrano': Integration('capistrano', 'capistrano', doc='zerver/integrations/capistrano.html'),
'codebase': Integration('codebase', 'codebase', doc='zerver/integrations/codebase.html'),
'email': EmailIntegration('email', 'email'),
'email': EmailIntegration('email', 'email', doc='zerver/integrations/email.html'),
'git': Integration('git', 'git'),
'google-calendar': Integration('google-calendar', 'google-calendar', display_name='Google Calendar'),
'hubot': Integration('hubot', 'hubot'),