paulmataruso/docker-zulip
1
0
Fork 0
mirror of https://github.com/zulip/docker-zulip.git synced 2025-10-24 00:23:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added some v1.3.10 options back in to fix occuring problems

Browse Source
This commit is contained in:
Alexander Trost
2016-04-24 13:11:37 +02:00
parent 9a35a51ac3
commit a69bc54db7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
custom_zulip_files/zproject/settings.py
View File

@@ -144,6 +144,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'INITIAL_PASSWORD_SALT': None, 'INITIAL_PASSWORD_SALT': None,
'FEEDBACK_BOT': 'feedback@zulip.com', 'FEEDBACK_BOT': 'feedback@zulip.com',
'FEEDBACK_BOT_NAME': 'Zulip Feedback Bot', 'FEEDBACK_BOT_NAME': 'Zulip Feedback Bot',
'API_SUPER_USERS': set(),
'ADMINS': '', 'ADMINS': '',
'INLINE_IMAGE_PREVIEW': True, 'INLINE_IMAGE_PREVIEW': True,
'CAMO_URI': '', 'CAMO_URI': '',
@@ -465,6 +466,8 @@ for bot in INTERNAL_BOTS:
bot_email = bot['email_template'] % (INTERNAL_BOT_DOMAIN,) bot_email = bot['email_template'] % (INTERNAL_BOT_DOMAIN,)
vars()[bot['var_name'] ] = bot_email 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 != "": if EMAIL_GATEWAY_PATTERN != "":
EMAIL_GATEWAY_EXAMPLE = EMAIL_GATEWAY_PATTERN % ("support+abcdefg",) EMAIL_GATEWAY_EXAMPLE = EMAIL_GATEWAY_PATTERN % ("support+abcdefg",)
@@ -677,7 +680,6 @@ JS_SPECS = {
'js/resize.js', 'js/resize.js',
'js/floating_recipient_bar.js', 'js/floating_recipient_bar.js',
'js/ui.js', 'js/ui.js',
'js/pointer.js',
'js/click_handlers.js', 'js/click_handlers.js',
'js/scroll_bar.js', 'js/scroll_bar.js',
'js/gear_menu.js', 'js/gear_menu.js',