diff --git a/humbug/settings.py b/humbug/settings.py index 5fc0c45dcc..f6f831787e 100644 --- a/humbug/settings.py +++ b/humbug/settings.py @@ -30,7 +30,7 @@ else: ALLOWED_HOSTS = ['localhost'] ADMINS = ( - ('Humbug Error Reports', 'errors@humbughq.com'), + ('Zulip Error Reports', 'errors@zulip.com'), ) MANAGERS = ADMINS @@ -542,7 +542,7 @@ EMAIL_HOST_USER = 'humbug@humbughq.com' EMAIL_HOST_PASSWORD = 'xxxxxxxxxxxxxxxx' EMAIL_PORT = 587 -DEFAULT_FROM_EMAIL = "Humbug " +DEFAULT_FROM_EMAIL = "Zulip " LOGIN_REDIRECT_URL='/' OPENID_SSO_SERVER_URL = 'https://www.google.com/accounts/o8/id' diff --git a/templates/404.html b/templates/404.html index 65bee1750f..44da6a268b 100644 --- a/templates/404.html +++ b/templates/404.html @@ -9,6 +9,6 @@

We know this is stressful, but we still love you.

-

If you'd like, you can drop us a line to let us know what happened.

+

If you'd like, you can drop us a line to let us know what happened.

{% endblock %} diff --git a/templates/500.html b/templates/500.html index ebdd89750a..bdb80ba89f 100644 --- a/templates/500.html +++ b/templates/500.html @@ -14,6 +14,6 @@

Well oops. This one's probably our fault. Sorry about that!

-

If you'd like, you can drop us a line to let us know what happened.

+

If you'd like, you can drop us a line to let us know what happened.

{% endblock %} diff --git a/templates/confirmation/confirm.html b/templates/confirmation/confirm.html index 499c36da3f..ecd5a5711e 100644 --- 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.

Anyway, shoot us a line at support@humbughq.com and we'll get + href="mailto:support@zulip.com">support@zulip.com and we'll get this resolved shortly.

{% endif %} diff --git a/templates/confirmation/invite_email_body.txt b/templates/confirmation/invite_email_body.txt index e26b0b28fe..1b3a898688 100644 --- 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 if you have any questions. +Feel free to give us a shout at if you have any questions. Cheers, diff --git a/templates/confirmation/preregistrationuser_confirmation_email_body.txt b/templates/confirmation/preregistrationuser_confirmation_email_body.txt index 4e184b8a68..b07bacf743 100644 --- 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 if you have any questions. +Feel free to give us a shout at if you have any questions. Cheers, diff --git a/templates/openid_error.html b/templates/openid_error.html index 80d3278dbd..88afb8253c 100644 --- a/templates/openid_error.html +++ b/templates/openid_error.html @@ -10,6 +10,6 @@

You might want to try logging in via Google again or log in with a username or password.

-

If you'd like, you can also drop us a line to let us know what happened.

+

If you'd like, you can also drop us a line to let us know what happened.

{% endblock %} diff --git a/templates/zephyr/apps.html b/templates/zephyr/apps.html index 1a44269d8a..db2d9a7888 100644 --- a/templates/zephyr/apps.html +++ b/templates/zephyr/apps.html @@ -46,7 +46,7 @@

Zulip has a 100% native app for iPhone, and we're in the process of getting it into the App Store. For now, - please email + please email us to request access.

@@ -117,7 +117,7 @@ sudo apt-get install zulip-desktop we're hiring. Please send us a resume and any other relevant information (a GitHub account, a portfolio, etc.) to jobs@humbughq.com + href="mailto:jobs@zulip.com?subject=Zulip%20for%20Plan%209">jobs@zulip.com and we'll be in touch!

diff --git a/templates/zephyr/integrations.html b/templates/zephyr/integrations.html index 0571812387..ffaab128f1 100644 --- a/templates/zephyr/integrations.html +++ b/templates/zephyr/integrations.html @@ -39,7 +39,7 @@

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 email + to email us.

Services with integrations

@@ -59,7 +59,7 @@
  • Trello
  • Twitter
    • {% endcomment %} -
  • ...and more coming soon! Email us with requests!
    • +
  • ...and more coming soon! Email us with requests!
    • {#--------------------------------------------------------------------#}
    @@ -234,7 +234,7 @@ following, to the stream commits with a subject that matches the re
  • Did you set up a post-build action for your project?
  • Does the stream you picked (e.g. jenkins) already exist? If not, add yourself to it and try again.
  • Are your access key and email address correct? Test them using our curl API. -
  • Still stuck? Email support@humbughq.com.
    • +
  • Still stuck? Email support@zulip.com.

    • ^ Back to top diff --git a/templates/zephyr/jobs/lead-designer.html b/templates/zephyr/jobs/lead-designer.html index 53b49456ea..40ff8b6824 100644 --- a/templates/zephyr/jobs/lead-designer.html +++ b/templates/zephyr/jobs/lead-designer.html @@ -55,7 +55,7 @@ Apply now
    -

    Questions? Please email us at jobs@humbughq.com.

    +

    Questions? Please email us at jobs@zulip.com.

    diff --git a/templates/zephyr/new-user.html b/templates/zephyr/new-user.html index d24e47b0fb..37341895d7 100644 --- a/templates/zephyr/new-user.html +++ b/templates/zephyr/new-user.html @@ -48,7 +48,7 @@

    You're ready to go!

    -

    If you have any feedback, please, send it our way!

    +

    If you have any feedback, please, send it our way!

    {% endblock %} diff --git a/templates/zephyr/signup.html b/templates/zephyr/signup.html index 37b243d54f..1d6cb6534b 100644 --- a/templates/zephyr/signup.html +++ b/templates/zephyr/signup.html @@ -29,7 +29,7 @@

    Ruh-roh!

    - Hmmm, something went wrong. Please send email to support@humbughq.com. + Hmmm, something went wrong. Please send email to support@zulip.com.
    diff --git a/templates/zephyr/terms.html b/templates/zephyr/terms.html index a5719a6757..4a0f41d2cf 100644 --- a/templates/zephyr/terms.html +++ b/templates/zephyr/terms.html @@ -64,7 +64,7 @@ additional terms may apply and your administrator may be able to access or disable your account.

    If you learn of any unauthorized use of your password or account, contact support@humbughq.com.

    +href="mailto:support@zulip.com">support@zulip.com.

    Privacy and Copyright Protection

    @@ -85,7 +85,7 @@ Services is:

    Humbug, Inc.
    552 Massachusetts Ave Suite 203
    Cambridge, MA 02139
    -copyright@humbughq.com +copyright@zulip.com

    Your Content in our Services

    diff --git a/zephyr/lib/actions.py b/zephyr/lib/actions.py index 56f6d17f2f..7c835a7005 100644 --- 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 " subject = "Missed Zulip%s from %s" % ('s' if len(senders) > 1 else '', sender_str) - from_email = "%s (via Zulip) " % (sender_str) + from_email = "%s (via Zulip) " % (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 index 4e84c2476a..5480e78d25 100644 --- a/zephyr/static/html/404.html +++ b/zephyr/static/html/404.html @@ -34,7 +34,7 @@

    We know this is stressful, but we still love you.

    -

    If you'd like, you can drop us a line to let us know what happened.

    +

    If you'd like, you can drop us a line to let us know what happened.

    diff --git a/zephyr/static/html/5xx.html b/zephyr/static/html/5xx.html index 2c59e5ace1..f790871c4b 100644 --- a/zephyr/static/html/5xx.html +++ b/zephyr/static/html/5xx.html @@ -36,7 +36,7 @@

    Well oops. This one's probably our fault. Sorry about that!

    -

    If you'd like, you can drop us a line to let us know what happened.

    +

    If you'd like, you can drop us a line to let us know what happened.