From 6bb9b129f79d843fe6d45eeb50ae16b2d1979e78 Mon Sep 17 00:00:00 2001 From: Waseem Daher Date: Mon, 28 Sep 2015 21:17:08 -0700 Subject: [PATCH] Update Zulip support email to zulip-devel@googlegroups.com. Ideally some of these templates should really point to the local installation's support email address, but this is a good start. Exceptions: * Where to report security incidents * MIT Zephyr-related pages * zulip.com terms and conditions --- api/integrations/basecamp/zulip_basecamp_mirror | 2 +- api/integrations/codebase/zulip_codebase_mirror | 2 +- api/setup.py | 2 +- bots/jabber_mirror.py | 2 +- puppet/zulip_internal/files/mediawiki/LocalSettings.php | 4 ++-- static/html/404.html | 2 +- static/html/5xx.html | 2 +- templates/zerver/deactivated.html | 2 +- templates/zerver/integrations.html | 6 +++--- zerver/forms.py | 2 +- zproject/local_settings_template.py | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/api/integrations/basecamp/zulip_basecamp_mirror b/api/integrations/basecamp/zulip_basecamp_mirror index 8638ad062c..f56fccff9b 100755 --- a/api/integrations/basecamp/zulip_basecamp_mirror +++ b/api/integrations/basecamp/zulip_basecamp_mirror @@ -49,7 +49,7 @@ client = zulip.Client( site=config.ZULIP_SITE, api_key=config.ZULIP_API_KEY, client="ZulipBasecamp/" + VERSION) -user_agent = "Basecamp To Zulip Mirroring script (support@zulip.com)" +user_agent = "Basecamp To Zulip Mirroring script (zulip-devel@googlegroups.com)" htmlParser = HTMLParser() # find some form of JSON loader/dumper, with a preference order for speed. diff --git a/api/integrations/codebase/zulip_codebase_mirror b/api/integrations/codebase/zulip_codebase_mirror index 92bb060977..6f7d8fc282 100755 --- a/api/integrations/codebase/zulip_codebase_mirror +++ b/api/integrations/codebase/zulip_codebase_mirror @@ -58,7 +58,7 @@ client = zulip.Client( site=config.ZULIP_SITE, api_key=config.ZULIP_API_KEY, client="ZulipCodebase/" + VERSION) -user_agent = "Codebase To Zulip Mirroring script (support@zulip.com)" +user_agent = "Codebase To Zulip Mirroring script (zulip-devel@googlegroups.com)" # find some form of JSON loader/dumper, with a preference order for speed. json_implementations = ['ujson', 'cjson', 'simplejson', 'json'] diff --git a/api/setup.py b/api/setup.py index 2ec3a44cf1..e12955db12 100644 --- a/api/setup.py +++ b/api/setup.py @@ -26,7 +26,7 @@ package_info = dict( version=version(), description='Bindings for the Zulip message API', author='Zulip, Inc.', - author_email='support@zulip.com', + author_email='zulip-devel@googlegroups.com', classifiers=[ 'Development Status :: 3 - Alpha', 'Environment :: Web Environment', diff --git a/bots/jabber_mirror.py b/bots/jabber_mirror.py index 0bfe8a167e..7146d14045 100755 --- a/bots/jabber_mirror.py +++ b/bots/jabber_mirror.py @@ -54,6 +54,6 @@ while backoff.keep_going(): print "" print "" print "ERROR: The Jabber mirroring bot is unable to continue mirroring Jabber." -print "Please contact support@zulip.com if you need assistance." +print "Please contact zulip-devel@googlegroups.com if you need assistance." print "" sys.exit(1) diff --git a/puppet/zulip_internal/files/mediawiki/LocalSettings.php b/puppet/zulip_internal/files/mediawiki/LocalSettings.php index 850ce2c9a8..1d13307a7a 100644 --- a/puppet/zulip_internal/files/mediawiki/LocalSettings.php +++ b/puppet/zulip_internal/files/mediawiki/LocalSettings.php @@ -49,8 +49,8 @@ $wgLogo = "$wgStylePath/common/images/wiki.png"; $wgEnableEmail = true; $wgEnableUserEmail = true; # UPO -$wgEmergencyContact = "support@zulip.com"; -$wgPasswordSender = "support@zulip.com"; +$wgEmergencyContact = "zulip-devel@googlegroups.com"; +$wgPasswordSender = "zulip-devel@googlegroups.com"; $wgEnotifUserTalk = true; # UPO $wgEnotifWatchlist = true; # UPO diff --git a/static/html/404.html b/static/html/404.html index cb4f0e2b02..f2f36bbcb7 100644 --- a/static/html/404.html +++ b/static/html/404.html @@ -33,7 +33,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/static/html/5xx.html b/static/html/5xx.html index b0297c7250..acc0aa5574 100644 --- a/static/html/5xx.html +++ b/static/html/5xx.html @@ -39,7 +39,7 @@ data-screen-name="ZulipStatus" >@ZulipStatus on Twitter.

-

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/templates/zerver/deactivated.html b/templates/zerver/deactivated.html index d2c8154445..244ea1610d 100644 --- a/templates/zerver/deactivated.html +++ b/templates/zerver/deactivated.html @@ -8,7 +8,7 @@

The organization you are trying to join, {{ deactivated_domain_name }}, has been deactivated. Please -contact support@zulip.com to reactivate +contact zulip-devel@googlegroups.com to reactivate this group.

{% endblock %} diff --git a/templates/zerver/integrations.html b/templates/zerver/integrations.html index 33a59f4bc9..d95df4caf9 100644 --- a/templates/zerver/integrations.html +++ b/templates/zerver/integrations.html @@ -24,7 +24,7 @@

With Zulip integrations, your team can stay up-to-date on code changes, issue tickets, build system results, and much more. If you don't see the system you would like to integrate with it, or run into any - trouble, don't hesitate to email us.

+ trouble, don't hesitate to email us.

Many of these integrations require creating a Zulip bot. You can do so on your Zulip settings page. Be sure to note its username and API key.

@@ -270,7 +270,7 @@ example, auto-restarting through supervisord).

Please - contact support@zulip.com + contact zulip-devel@googlegroups.com if you'd like assistance with maintaining this integration.

@@ -924,7 +924,7 @@
  • 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@zulip.com.
    • +
  • Still stuck? Email zulip-devel@googlegroups.com.

    • diff --git a/zerver/forms.py b/zerver/forms.py index 7e5c41f14f..15aaaa8a98 100644 --- a/zerver/forms.py +++ b/zerver/forms.py @@ -93,7 +93,7 @@ class OurAuthenticationForm(AuthenticationForm): if user_profile.realm.deactivated: error_msg = u"""Sorry for the trouble, but %s has been deactivated. -Please contact support@zulip.com to reactivate this group.""" % ( +Please contact zulip-devel@googlegroups.com to reactivate this group.""" % ( user_profile.realm.name,) raise ValidationError(mark_safe(error_msg)) diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py index bfdb80198a..2173a7870e 100644 --- a/zproject/local_settings_template.py +++ b/zproject/local_settings_template.py @@ -103,7 +103,7 @@ INLINE_IMAGE_PREVIEW = True # By default, files uploaded by users and user avatars are stored # directly on the Zulip server. If file storage in Amazon S3 (or # elsewhere, e.g. your corporate fileshare) is desired, please contact -# Zulip Support (support@zulip.com) for further instructions on +# Zulip Support (zulip-devel@googlegroups.com) for further instructions on # setting up the appropriate integration. LOCAL_UPLOADS_DIR = "/home/zulip/uploads"