paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup various minor Zanitization issues.

Browse Source 
(imported from commit 5784eb5ac70706f72b05463354434a83a6e1beaa)
This commit is contained in:
Tim Abbott
2015-09-20 00:25:27 -07:00
parent 5e0b6b809a
commit 36a9dc2cf7
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zerver/lib/statistics.py
View File

@@ -99,8 +99,7 @@ def activity_averages_during_day(day):
return calculate_stats(seconds_active, all_users=users_to_measure) return calculate_stats(seconds_active, all_users=users_to_measure)
# Returns an info dict {mean: , median} with engagement numbers for all users according # Returns an info dict {mean: , median} with engagement numbers for all users according
# to active_users_to_measure. This will ignore weekends, and ignore users.customer4.invalid # to active_users_to_measure.
# on Fridays
def activity_averages_between(begin, end, by_day=True): def activity_averages_between(begin, end, by_day=True):
seconds_active = {} seconds_active = {}
users_to_measure = active_users_to_measure() users_to_measure = active_users_to_measure()

3
zproject/local_settings.py
View File

@@ -97,9 +97,6 @@ ALLOWED_HOSTS = ['localhost', '.humbughq.com', '54.214.48.144', '54.213.44.54',
'54.244.50.64', '54.244.50.65', '54.244.50.74', '54.244.50.64', '54.244.50.65', '54.244.50.74',
'chat.dropboxer.net'] 'chat.dropboxer.net']
JWT_AUTH_KEYS = {}
NOTIFICATION_BOT = "notification-bot@zulip.com" NOTIFICATION_BOT = "notification-bot@zulip.com"
ERROR_BOT = "error-bot@zulip.com" ERROR_BOT = "error-bot@zulip.com"
NEW_USER_BOT = "new-user-bot@zulip.com" NEW_USER_BOT = "new-user-bot@zulip.com"

1
zproject/settings.py
View File

@@ -123,6 +123,7 @@ DEFAULT_SETTINGS = {'TWITTER_CONSUMER_KEY': '',
'LOCAL_UPLOADS_DIR': None, 'LOCAL_UPLOADS_DIR': None,
'DROPBOX_APP_KEY': '', 'DROPBOX_APP_KEY': '',
'ERROR_REPORTING': True, 'ERROR_REPORTING': True,
'JWT_AUTH_KEYS': {},
'NAME_CHANGES_DISABLED': False, 'NAME_CHANGES_DISABLED': False,
'DEPLOYMENT_ROLE_NAME': "", 'DEPLOYMENT_ROLE_NAME': "",
# The following bots only exist in non-VOYAGER installs # The following bots only exist in non-VOYAGER installs