mirror of https://github.com/zulip/zulip.git
Revise day1/day2 emails.
(imported from commit dc5e78cccb22b024be46b3066d44f09ea1b53345)
This commit is contained in:
Waseem Daher
parent
559f0896a1
commit
89844c6ced
|
|
@ -15,42 +15,40 @@
|
||||||
<tr><td style="font-size:16px; font-family:Helvetica;">
|
<tr><td style="font-size:16px; font-family:Helvetica;">
|
||||||
<p>Hi there!</p>
|
<p>Hi there!</p>
|
||||||
|
|
||||||
<p>Welcome to Zulip!</p>
|
<p>Welcome to Zulip.</p>
|
||||||
|
|
||||||
<p><a href="https://{{ external_host }}/hello" style="color:#08c">https://{{ external_host }}/hello</a> has a nice overview of what we're up to, but here are a few tips that'll help you get the most out of it:</p>
|
<p><a href="https://{{ external_host }}/hello" style="color:#08c">https://{{ external_host }}/hello</a> has a nice overview of what we're up to, but here are a few tips that'll help you get the most out of it:</p>
|
||||||
|
|
||||||
<ol>
|
<ol>
|
||||||
<li>Zulip works best when it's always open, so <a href="https://{{ external_host }}/apps" style="color:#08c">grab our apps</a>! (Mac, Windows, Linux, Android, iOS)</li>
|
<li>Zulip works best when it's always open, so <a href="https://{{ external_host }}/apps" style="color:#08c">grab our apps</a>! (Mac, Windows, Linux, Android, iOS)</li>
|
||||||
|
|
||||||
<li>Keyboard shortcuts: learn about them in the Keyboard Shortcuts tab under the gear icon. (Or press '?')</li>
|
<li>Want to <b>share files</b> in Zulip? No problem! Start a new message and click the paperclip, or just drag-and-drop the file into the textbox.</li>
|
||||||
|
|
||||||
<li>Talking about code? Use our Markdown support to format and even syntax-highlight your messages!<br />
|
<li>Trying to <b>get someone's attention</b>? Type in an @-sign followed by their name to "mention" them.</li>
|
||||||
For example, typing this:
|
|
||||||
<pre style="padding:9.5px; background-color:#f5f5f5; border-radius:4px; border:1px solid rgba(0,0,0,0.15); font-family:Monaco,Menlo,Consolas,'Courier New',monospace">~~~ .py
|
|
||||||
def fn(arg):
|
|
||||||
print "Hello"
|
|
||||||
~~~</pre>
|
|
||||||
gets you this:
|
|
||||||
<pre style="padding:9.5px; background-color:#f5f5f5; border-radius:4px; border:1px solid rgba(0,0,0,0.15); font-family:Monaco,Menlo,Consolas,'Courier New',monospace"><span style="color:#008000; font-weight:bold">def</span> <span style="color:#00f">fn</span>(arg):
|
|
||||||
<span style="color:#008000; font-weight:bold">print</span> <span style="color:#ba2121">"Hello"</span></pre>
|
|
||||||
</li>
|
|
||||||
<li>Got automation? Check out <a href="https://{{ external_host }}/integrations" style="color:#08c">our integrations</a> and <a href="https://{{ external_host }}/api" style="color:#08c">API</a> for easy integration with services like GitHub, Jenkins, Nagios, and Trac. They're super-easy to set up and make things a lot more useful.</li>
|
|
||||||
|
|
||||||
<li>Emoji. Because <pre style="display:inline; color:#D14; padding:2px 4px; background-color:#f5f5f5; border-radius:4px; border:1px solid rgba(0,0,0,0.15); font-family:Monaco,Menlo,Consolas,'Courier New',monospace">:ramen:</pre> means <img src="https://{{ external_host }}/static/third/gemoji/images/emoji/ramen.png" style="max-height:20px; height:20px;" height="20px" />.</li>
|
<li>Bulleted lists, bold, code blocks, and more are all at your fingertips - just check out <b>"Message formatting"</b> in the gear menu.</li>
|
||||||
|
|
||||||
|
<li>Are you a keyboard power user? Learn about <b>keyboard shortcuts</b> in the Keyboard Shortcuts tab under the gear icon. (Or press '?')</li>
|
||||||
|
|
||||||
|
<li><b>Emoji</b>. Because <pre style="display:inline; color:#D14; padding:2px 4px; background-color:#f5f5f5; border-radius:4px; border:1px solid rgba(0,0,0,0.15); font-family:Monaco,Menlo,Consolas,'Courier New',monospace">:ramen:</pre> means <img src="https://{{ external_host }}/static/third/gemoji/images/emoji/ramen.png" style="max-height:20px; height:20px;" height="20px" />.</li>
|
||||||
</ol>
|
</ol>
|
||||||
|
|
||||||
{% if not_enterprise %}
|
{% if not_enterprise %}
|
||||||
<p>Zulip is under active development, and we have a team of engineers standing by to respond to your feedback, so please report bugs and let us know what you think! There's a feedback tab under the gear icon in the upper-right corner, or you can e-mail us at <a href="mailto:feedback@zulip.com" style="color:#08c">feedback@zulip.com</a>.</p>
|
<p>Zulip has a team of engineers standing by to respond to your feedback, so please let us know what you think! Click the "Send feedback" button inside Zulip, or just reply to this email.</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
</p>-Waseem, for the Zulip team</p>
|
{% if not_enterprise %}
|
||||||
|
<p>- Waseem, for the Zulip team</p>
|
||||||
|
{% else %}
|
||||||
|
<p>Thanks,<br />Zulip</p>
|
||||||
|
{% endif %}
|
||||||
</td></tr>
|
</td></tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
<a href="https://{{ external_host }}/#settings">Manage email preferences</a> |
|
<a href="https://{{ external_host }}/#settings">Manage email preferences</a> |
|
||||||
<a href="{{ unsubscribe_link }}">Unsubscribe from welcome emails</a>
|
<a href="{{ unsubscribe_link }}">Unsubscribe from welcome emails</a> <small>(but there's only one more and aren't you a little curious?)</small>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
|
|
|
||||||
|
|
@ -1,35 +1,33 @@
|
||||||
Hi there!
|
Hi there!
|
||||||
|
|
||||||
Welcome to Zulip!
|
Welcome to Zulip.
|
||||||
|
|
||||||
https://{{ external_host }}/hello has a nice overview of what we're up to, but here are a couple tips that'll help you get the most out of it:
|
https://{{ external_host }}/hello has a nice overview of what we're up to, but here are a couple tips that'll help you get the most out of it:
|
||||||
|
|
||||||
1. Zulip works best when it's always open, so grab our apps! (Mac, Windows, Linux, Android, iOS)
|
1. Zulip works best when it's always open, so grab our apps! (Mac, Windows, Linux, Android, iOS)
|
||||||
https://{{ external_host }}/apps
|
https://{{ external_host }}/apps
|
||||||
|
|
||||||
2. Keyboard shortcuts: learn about them in the Keyboard Shortcuts tab under the gear icon. (Or press '?')
|
2. Want to share files in Zulip? No problem! Start a new message and click the paperclip, or just drag-and-drop the file into the textbox.
|
||||||
|
|
||||||
3. Talking about code? Use our Markdown support to format and even syntax-highlight your messages!
|
3. Trying to get someone's attention? Type in an @-sign followed by their name to "mention" them.
|
||||||
|
|
||||||
For example, the following will get nice highlighting:
|
4. Bulleted lists, bold, code blocks, and more are all at your fingertips - just check out "Message formatting" in the gear menu.
|
||||||
~~~ .py
|
|
||||||
def fn(arg):
|
|
||||||
print "Hello"
|
|
||||||
~~~
|
|
||||||
|
|
||||||
4. Got automation? Check out https://{{ external_host }}/integrations and https://{{ external_host }}/api for easy integration with services like GitHub, Jenkins, Nagios, and Trac. They're super-easy to set up and make things a lot more useful.
|
5. Are you a keyboard power user? Learn about keyboard shortcuts in the Keyboard Shortcuts tab under the gear icon. (Or press '?')
|
||||||
|
|
||||||
5. Emoji. Because :ramen:
|
6. Emoji. Because :ramen:
|
||||||
{% if not_enterprise %}
|
{% if not_enterprise %}
|
||||||
Zulip is under active development, and we have a team of engineers standing by to respond to your feedback, so please report bugs and let us know what you think! There's a feedback tab under the gear icon in the upper-right corner, or you can e-mail us at feedback@zulip.com.
|
Zulip has a team of engineers standing by to respond to your feedback, so please let us know what you think! Click the "Send feedback" button inside Zulip, or just reply to this email.
|
||||||
{% endif %}
|
{% endif %}
|
||||||
-Waseem, for the Zulip team
|
{% if not_enterprise %}
|
||||||
|
- Waseem, for the Zulip team
|
||||||
--
|
{% else %}
|
||||||
|
Thanks,
|
||||||
|
Zulip
|
||||||
|
{% endif %}
|
||||||
|
----
|
||||||
Manage email preferences:
|
Manage email preferences:
|
||||||
|
|
||||||
https://{{ external_host }}/#settings
|
https://{{ external_host }}/#settings
|
||||||
|
|
||||||
Unsubscribe from welcome emails:
|
Unsubscribe from welcome emails (but there's only one more and aren't you a little curious?):
|
||||||
|
|
||||||
{{ unsubscribe_link }}
|
{{ unsubscribe_link }}
|
||||||
|
|
|
||||||
|
|
@ -15,22 +15,24 @@
|
||||||
<tr><td style="font-size:16px; font-family:Helvetica;">
|
<tr><td style="font-size:16px; font-family:Helvetica;">
|
||||||
<p>Hey,</p>
|
<p>Hey,</p>
|
||||||
|
|
||||||
<p>We wanted to share one last thing with you: a few tips about <b>streams</b>
|
<p>I wanted to share one last thing with you: a few tips about topics, since mastering topics is a key part of being a Zulip power user.</p>
|
||||||
and <b>topics</b>.</p>
|
|
||||||
<p>While they take a little getting used to, once you get the hang of them, they're really powerful.</p>
|
<p>Topics are like email subject lines. The big difference, though, is that they're really short and lightweight. One or two words will do it. Don't overthink 'em—you can always edit the message later!</p>
|
||||||
<p>Some tips:</p>
|
|
||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Would you make a mailing list for something? If so, it should probably be a stream.</li>
|
<li>Bad topics: "What do people think of this new screenshot?", "I'm looking at Bug 345", "Where should we go to lunch?"</li>
|
||||||
<li>Topics, on the other hand, are a lot more like subject lines - or conversations in Gmail</li>
|
<li>Good topics: screenshot, Bug 345, lunch</li>
|
||||||
<li>The big difference: keep topics super-short and lightweight. One or two words will do it.</li>
|
|
||||||
<li>Good topics: jQuery, Bug 345, lunch, zulip</li>
|
|
||||||
<li>Bad topics: "What do people think of this?" "Where should we go to lunch?"</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<p><a href="https://{{ external_host }}">Try it out now!</a></p>
|
<p>Why bother with topics? Well, two reasons: it makes conversations clearer (imagine if email didn't have them!), and it lets you more efficiently catch up on what's happened while you're away—read the topics that are relevant to you, and ignore the ones that don't!</p>
|
||||||
|
|
||||||
<p>-Waseem, for the Zulip team</p>
|
<p><a href="https://{{ external_host }}">Take it for a spin now.</a></p>
|
||||||
|
|
||||||
|
{% if not_enterprise %}
|
||||||
|
<p>- Waseem, for the Zulip team</p>
|
||||||
|
{% else %}
|
||||||
|
<p>Thanks,<br />Zulip</p>
|
||||||
|
{% endif %}
|
||||||
</td></tr>
|
</td></tr>
|
||||||
|
|
||||||
</table>
|
</table>
|
||||||
|
|
|
||||||
|
|
@ -1,30 +1,26 @@
|
||||||
Hey,
|
Hey,
|
||||||
|
|
||||||
We wanted to share one last thing with you: a few tips about "streams" and "topics".
|
I wanted to share one last thing with you: a few tips about topics, since mastering topics is a key part of being a Zulip power user.
|
||||||
|
|
||||||
While they take a little getting used to, once you get the hang of them, they're really powerful.
|
Topics are like email subject lines. The big difference, though, is that they're really short and lightweight. One or two words will do it. Don't overthink 'em -- you can always edit the message later!
|
||||||
|
|
||||||
Some tips:
|
* Bad topics: "What do people think of this new screenshot?", "I'm looking at Bug 345", "Where should we go to lunch?"
|
||||||
|
|
||||||
* Would you make a mailing list for something? If so, it should probably be a stream.
|
* Good topics: screenshot, Bug 345, lunch
|
||||||
|
|
||||||
* Topics, on the other hand, are a lot more like subject lines - or conversations in Gmail
|
Why bother with topics? Well, two reasons: it makes conversations clearer (imagine if email didn't have them!), and it lets you more efficiently catch up on what's happened while you're away -- read the topics that are relevant to you, and ignore the ones that don't!
|
||||||
|
|
||||||
* The big difference: keep topics super-short and lightweight. One or two words will do it.
|
Take it for a spin now:
|
||||||
|
https://{{ external_host }}
|
||||||
* Good topics: jQuery, Bug 345, lunch, zulip
|
{% if not_enterprise %}
|
||||||
|
- Waseem, for the Zulip team
|
||||||
* Bad topics: "What do people think of this?" "Where should we go to lunch?"
|
{% else %}
|
||||||
|
Thanks,
|
||||||
Try it out now! https://{{ external_host }}
|
Zulip
|
||||||
|
{% endif %}
|
||||||
-Waseem, for the Zulip team
|
----
|
||||||
|
|
||||||
--
|
|
||||||
Manage email preferences:
|
Manage email preferences:
|
||||||
|
|
||||||
https://{{ external_host }}/#settings
|
https://{{ external_host }}/#settings
|
||||||
|
|
||||||
Unsubscribe from welcome emails:
|
Unsubscribe from welcome emails:
|
||||||
|
|
||||||
{{ unsubscribe_link }}
|
{{ unsubscribe_link }}
|
||||||
|
|
|
||||||
|
|
@ -74,8 +74,7 @@ Usage: python manage.py deliver_email
|
||||||
with lockfile("/tmp/zulip_email_deliver.lockfile"):
|
with lockfile("/tmp/zulip_email_deliver.lockfile"):
|
||||||
while True:
|
while True:
|
||||||
# make sure to use utcnow, otherwise it gets confused when you set the time with utcnow(), and select with now()
|
# make sure to use utcnow, otherwise it gets confused when you set the time with utcnow(), and select with now()
|
||||||
email_jobs_to_deliver = ScheduledJob.objects.filter(type=ScheduledJob.EMAIL,
|
email_jobs_to_deliver = ScheduledJob.objects.filter(type=ScheduledJob.EMAIL)
|
||||||
scheduled_timestamp__lte=datetime.utcnow())
|
|
||||||
if email_jobs_to_deliver:
|
if email_jobs_to_deliver:
|
||||||
for job in email_jobs_to_deliver:
|
for job in email_jobs_to_deliver:
|
||||||
if not send_email_job(job):
|
if not send_email_job(job):
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue