Switch from the @humbughq.com to @zulip.com addresses users can contact.

In particular support@ and jobs@. (imported from commit 8051ae5628b7378cde49b160d26b704e7e14bb24)
matt- · Jul 15, 2013 · 4d19c78 · 4d19c78
1 parent 89fcfc5
commit 4d19c78
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 21 deletions.
diff --git a/humbug/settings.py b/humbug/settings.py
@@ -30,7 +30,7 @@
     ALLOWED_HOSTS = ['localhost']
 
 ADMINS = (
-    ('Humbug Error Reports', 'errors@humbughq.com'),
+    ('Zulip Error Reports', 'errors@zulip.com'),
 )
 
 MANAGERS = ADMINS
@@ -542,7 +542,7 @@
 EMAIL_HOST_PASSWORD = 'xxxxxxxxxxxxxxxx'
 EMAIL_PORT = 587
 
-DEFAULT_FROM_EMAIL = "Humbug <humbug@humbughq.com>"
+DEFAULT_FROM_EMAIL = "Zulip <zulip@zulip.com>"
 
 LOGIN_REDIRECT_URL='/'
 OPENID_SSO_SERVER_URL = 'https://www.google.com/accounts/o8/id'

diff --git a/templates/404.html b/templates/404.html
@@ -9,6 +9,6 @@
 
 <p>We know this is stressful, but we still love you.</p>
 
-<p>If you'd like, you can <a href="mailto:support@humbughq.com?Subject=404%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20404%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
+<p>If you'd like, you can <a href="mailto:support@zulip.com?Subject=404%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20404%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
 
 {% endblock %}
diff --git a/templates/500.html b/templates/500.html
@@ -14,6 +14,6 @@
 
 <p>Well oops. This one's probably our fault. Sorry about that!</p>
 
-<p>If you'd like, you can <a href="mailto:support@humbughq.com?Subject=500%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20500%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
+<p>If you'd like, you can <a href="mailto:support@zulip.com?Subject=500%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20500%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
 
 {% endblock %}
diff --git a/templates/confirmation/confirm.html b/templates/confirmation/confirm.html
@@ -14,7 +14,7 @@
     still encountering this page, its probably our fault. We're sorry.<p>
 
     <p>Anyway, shoot us a line at <a
-    href="mailto:support@humbughq.com">support@humbughq.com</a> and we'll get
+    href="mailto:support@zulip.com">support@zulip.com</a> and we'll get
     this resolved shortly.</p>
 
 {% endif %}

diff --git a/templates/confirmation/invite_email_body.txt b/templates/confirmation/invite_email_body.txt
@@ -5,7 +5,7 @@ Hi there,
 To get started, visit the link below:
     <{{ activate_url }}>
 
-Feel free to give us a shout at <support@humbughq.com> if you have any questions.
+Feel free to give us a shout at <support@zulip.com> if you have any questions.
 
 Cheers,
 

diff --git a/templates/confirmation/preregistrationuser_confirmation_email_body.txt b/templates/confirmation/preregistrationuser_confirmation_email_body.txt
@@ -5,7 +5,7 @@ You recently signed up for Zulip. Awesome!
 To complete signup, visit this link below:
     <{{ activate_url }}>
 
-Feel free to give us a shout at <support@humbughq.com> if you have any questions.
+Feel free to give us a shout at <support@zulip.com> if you have any questions.
 
 Cheers,
 

diff --git a/templates/openid_error.html b/templates/openid_error.html
@@ -10,6 +10,6 @@
 <p>You might want to <a href="{% url 'django_openid_auth.views.login_begin' %}">try logging in via Google again</a>
   or <a href="{% url 'django.contrib.auth.views.login' %}">log in with a username or password.</a></p>
 
-<p>If you'd like, you can also <a href="mailto:support@humbughq.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Zulip%20using%20my%20email%20address%[email protected]%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
+<p>If you'd like, you can also <a href="mailto:support@zulip.com?Subject=Error%20logging%20in%20with%20Google%20Apps&Body=Hi%20there%2C%0A%0AI%20encountered%20an%20error%20when%20attempting%20to%20log%20in%20with%20Google%20Apps%20on%20Zulip%20using%20my%20email%20address%[email protected]%0A%0AError%20message%3A%20%20{{ message|escape }}%0A%0ASincerely%2C%20%0A%0AYour%20name%20here">drop us a line</a> to let us know what happened.</p>
 
 {% endblock %}
diff --git a/templates/zephyr/apps.html b/templates/zephyr/apps.html
@@ -46,7 +46,7 @@ <h3>Installation instructions</h3>
         <p>Zulip has a <strong>100% native app</strong> for iPhone,
           and we're in the process of getting it into the App Store.
           For now,
-          please <a target="_blank" href="mailto:support@humbughq.com?subject=Request%20for%20Zulip%20iPhone%20app&amp;body=Hi%20Zulip,%20can%20you%20send%20me%20a%20link%20to%20the%20iPhone%20app%20alpha?%20I%20have%20an%20iPhone%20__.">email
+          please <a target="_blank" href="mailto:support@zulip.com?subject=Request%20for%20Zulip%20iPhone%20app&amp;body=Hi%20Zulip,%20can%20you%20send%20me%20a%20link%20to%20the%20iPhone%20app%20alpha?%20I%20have%20an%20iPhone%20__.">email
           us to request access</a>.</p>
       </div>
 
@@ -117,7 +117,7 @@ <h3>Other</h3>
         we're hiring. Please send us a resume and any other relevant
         information (a GitHub account, a portfolio, etc.)
         to <a target="_blank"
-        href="mailto:jobs@humbughq.com?subject=Zulip%20for%20Plan%209">jobs@humbughq.com</a>
+        href="mailto:jobs@zulip.com?subject=Zulip%20for%20Plan%209">jobs@zulip.com</a>
         and we'll be in touch!</p>
       </div>
 

diff --git a/templates/zephyr/integrations.html b/templates/zephyr/integrations.html
@@ -39,7 +39,7 @@ <h3>Getting started</h3>
     <p>Then, follow the integration instructions below for the service
     you are interested in. It's as easy as that! If you run into any
     trouble, don't hesitate
-    to <a href="mailto:support@humbughq.com?subject=Integration%20question">email
+    to <a href="mailto:support@zulip.com?subject=Integration%20question">email
     us</a>.</p>
 
     <h3 id="services">Services with integrations</h3>
@@ -59,7 +59,7 @@ <h3 id="services">Services with integrations</h3>
       <li><a href="#trello">Trello</a></li>
       <li><a href="#twitter">Twitter</a></li>
       {% endcomment %}
-      <li>...and more coming soon! <a href="mailto:support@humbughq.com?subject=Integration%20request">Email us</a> with requests!</li>
+      <li>...and more coming soon! <a href="mailto:support@zulip.com?subject=Integration%20request">Email us</a> with requests!</li>
     </ul>
     {#--------------------------------------------------------------------#}
     <div id="beanstalk" class="integration">
@@ -234,7 +234,7 @@ <h4>Jenkins (or Hudson)</h4>
           <li>Did you set up a post-build action for your project?</li>
           <li>Does the stream you picked (e.g. <code>jenkins</code>) already exist? If not, add yourself to it and try again.</li>
           <li>Are your access key and email address correct? Test them using <a href="/api">our curl API</a>.
-          <li>Still stuck? Email <a href="mailto:support@humbughq.com?subject=Jenkins">support@humbughq.com</a>.</li>
+          <li>Still stuck? Email <a href="mailto:support@zulip.com?subject=Jenkins">support@zulip.com</a>.</li>
         </ul>
       <p>
         <a href="#services">^ Back to top</a>

diff --git a/templates/zephyr/jobs/lead-designer.html b/templates/zephyr/jobs/lead-designer.html
@@ -55,7 +55,7 @@ <h1>Lead Designer</h1>
         <i class="icon-white icon-pencil"></i> Apply now</a></center>
 
     <br />
-    <p>Questions? Please email us at <a href="mailto:jobs@humbughq.com?subject=Lead%20designer%20job%20posting">jobs@humbughq.com</a>.</p>
+    <p>Questions? Please email us at <a href="mailto:jobs@zulip.com?subject=Lead%20designer%20job%20posting">jobs@zulip.com</a>.</p>
 
     </div>
 </div>

diff --git a/templates/zephyr/new-user.html b/templates/zephyr/new-user.html
@@ -48,7 +48,7 @@ <h3>Some things to know</h3>
     </ul>
 
     <h3>You're ready to go!</h3>
-    <p>If you have any feedback, please, <a href="mailto:support@humbughq.com">send it our way</a>!</p>
+    <p>If you have any feedback, please, <a href="mailto:support@zulip.com">send it our way</a>!</p>
   </div>
 </div>
 {% endblock %}
diff --git a/templates/zephyr/signup.html b/templates/zephyr/signup.html
@@ -29,7 +29,7 @@ <h4>Success!</h4>
 
       <div id="error" class="alert alert-hidden alert-error alert-block">
         <h4>Ruh-roh!</h4>
-        Hmmm, something went wrong. Please send email to <a href="mailto:support@humbughq.com">support@humbughq.com</a>.
+        Hmmm, something went wrong. Please send email to <a href="mailto:support@zulip.com">support@zulip.com</a>.
       </div>
 
       <div id="error-missing-email" class="alert alert-hidden alert-error alert-block">

diff --git a/templates/zephyr/terms.html b/templates/zephyr/terms.html
@@ -64,7 +64,7 @@ <h3>Your Zulip Account</h3>
 disable your account.</p>
 
 <p>If you learn of any unauthorized use of your password or account, contact <a
-href="mailto:support@humbughq.com">support@humbughq.com</a>.</p>
+href="mailto:support@zulip.com">support@zulip.com</a>.</p>
 
 
 <h3>Privacy and Copyright Protection</h3>
@@ -85,7 +85,7 @@ <h3>Privacy and Copyright Protection</h3>
 Humbug, Inc.<br />
 552 Massachusetts Ave Suite 203<br />
 Cambridge, MA 02139<br />
-<a href="mailto:copyright@humbughq.com">copyright@humbughq.com</a></blockquote>
+<a href="mailto:copyright@zulip.com">copyright@zulip.com</a></blockquote>
 
 
 <h3>Your Content in our Services</h3>

diff --git a/zephyr/lib/actions.py b/zephyr/lib/actions.py
@@ -1271,7 +1271,7 @@ def do_send_missedmessage_email(user_profile, missed_messages):
         headers['Reply-To'] = "Nobody <[email protected]>"
 
     subject = "Missed Zulip%s from %s" % ('s' if len(senders) > 1 else '', sender_str)
-    from_email = "%s (via Zulip) <noreply@humbughq.com>" % (sender_str)
+    from_email = "%s (via Zulip) <noreply@zulip.com>" % (sender_str)
 
     text_content = loader.render_to_string('zephyr/missed_message_email.txt', template_payload)
     html_content = loader.render_to_string('zephyr/missed_message_email_html.txt', template_payload)

diff --git a/zephyr/static/html/404.html b/zephyr/static/html/404.html
@@ -34,7 +34,7 @@
 
         <p>We know this is stressful, but we still love you.</p>
 
-        <p>If you'd like, you can <a href="mailto:support@humbughq.com?Subject=404%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20404%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
+        <p>If you'd like, you can <a href="mailto:support@zulip.com?Subject=404%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20404%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
     </div>
 </div>
 

diff --git a/zephyr/static/html/5xx.html b/zephyr/static/html/5xx.html
@@ -36,7 +36,7 @@
 
         <p>Well oops. This one's probably our fault. Sorry about that!</p>
 
-        <p>If you'd like, you can <a href="mailto:support@humbughq.com?Subject=500%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20500%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
+        <p>If you'd like, you can <a href="mailto:support@zulip.com?Subject=500%20error%20on%20%7Bwhich%20URL%3F%7D&Body=Hi%20there%21%0A%0AI%20was%20trying%20to%20do%20%7Bwhat%20were%20you%20trying%20to%20do%3F%7D%20at%20around%20%7Bwhen%20was%20this%3F%7D%20when%20I%20got%20a%20500%20error%20while%20accessing%20%7Bwhich%20URL%3F%7D.%0A%0AThanks!%0A%0ASincerely%2C%20%0A%0A%7BYour%20name%7D">drop us a line</a> to let us know what happened.</p>
     </div>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,7 @@ <h1>Lead Designer</h1> @@
             <i class="icon-white icon-pencil"></i> Apply now</a></center>
         <br />
-        <p>Questions? Please email us at <a href="mailto:jobs@humbughq.com?subject=Lead%20designer%20job%20posting">jobs@humbughq.com</a>.</p>
+        <p>Questions? Please email us at <a href="mailto:jobs@zulip.com?subject=Lead%20designer%20job%20posting">jobs@zulip.com</a>.</p>
         </div>
     </div>
@@ Expand Down @@