mirror of
https://github.com/zulip/docker-zulip.git
synced 2025-10-23 04:51:58 +00:00
Added some v1.3.10 options back in to fix occuring problems
This commit is contained in:
@@ -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',
|
||||
|
Reference in New Issue
Block a user