From a69bc54db7dd891d8c4039d804d5c5859eb40a0d Mon Sep 17 00:00:00 2001 From: Alexander Trost Date: Sun, 24 Apr 2016 13:11:37 +0200 Subject: [PATCH] Added some v1.3.10 options back in to fix occuring problems --- custom_zulip_files/zproject/settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom_zulip_files/zproject/settings.py b/custom_zulip_files/zproject/settings.py index 697e288..0fcf2cb 100644 --- a/custom_zulip_files/zproject/settings.py +++ b/custom_zulip_files/zproject/settings.py @@ -144,6 +144,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '', 'INITIAL_PASSWORD_SALT': None, 'FEEDBACK_BOT': 'feedback@zulip.com', 'FEEDBACK_BOT_NAME': 'Zulip Feedback Bot', + 'API_SUPER_USERS': set(), 'ADMINS': '', 'INLINE_IMAGE_PREVIEW': True, 'CAMO_URI': '', @@ -465,6 +466,8 @@ for bot in INTERNAL_BOTS: bot_email = bot['email_template'] % (INTERNAL_BOT_DOMAIN,) vars()[bot['var_name'] ] = bot_email +if EMAIL_GATEWAY_BOT not in API_SUPER_USERS: + API_SUPER_USERS.add(EMAIL_GATEWAY_BOT) if EMAIL_GATEWAY_PATTERN != "": EMAIL_GATEWAY_EXAMPLE = EMAIL_GATEWAY_PATTERN % ("support+abcdefg",) @@ -677,7 +680,6 @@ JS_SPECS = { 'js/resize.js', 'js/floating_recipient_bar.js', 'js/ui.js', - 'js/pointer.js', 'js/click_handlers.js', 'js/scroll_bar.js', 'js/gear_menu.js',