Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,985 Commits 28 Branches 143 Tags 624 MiB
Commit Graph

112 Commits

Author SHA1 Message Date
Tim Abbott 386c6c2a31 settings: Refactor SYSTEM_ONLY_REALMS configuration. 2016-08-12 12:12:53 -07:00
Tim Abbott ecb81fabf3 settings: Extract EVENT_LOGS_ENABLED setting. 2016-08-12 12:12:53 -07:00
Rishi Gupta 7910a6e134 Terms of Service: Add ability to update TOS and have users re-sign. 
Most directly useful for the migration to zulipchat.com.

Creates a new field in UserProfile to store the tos_version, as well as two
new settings TOS_VERSION and FIRST_TIME_TOS_TEMPLATE. We check for a version
mismatch between what the user has signed and the current
settings.TOS_VERSION whenever the user hits the home page, and redirect them
if needed.

Note that accounts_accept_terms.html and
zerver.views.accounts_accept_terms were unused before this commit
(they date from c327446537)
 2016-08-11 23:37:48 -07:00
Tim Abbott f418e54ae2 local_settings: Fix zulip.com terms of service. 2016-08-11 16:39:47 -07:00
Umair Khan 0b88deb640 APNS_SANDBOX should be a bool. 
Fixes: #1480
 2016-08-05 10:36:57 -07:00
acrefoot b7ccf64c79 Move Zulip's TOS to TERMS_OF_SERVICE markdown file. 
This reimplements zulip.com/terms using the new markdown system.
 2016-07-29 20:47:42 -07:00
Tim Abbott 35339f5117 Rename local_settings_template to prod_settings_template. 2016-07-19 20:59:59 -07:00
Tim Abbott e876f12b83 settings: Extract settings.WELCOME_EMAIL_SENDER. 2016-07-19 15:28:41 -07:00
Tim Abbott 3ea4cbb5c3 settings: Extract settings.VERBOSE_SUPPORT_OFFERS. 2016-07-19 15:28:41 -07:00
Tim Abbott ff1faffecd settings: Extract EMAIL_GATEWAY_EXTRA_PATTERN_HACK. 2016-07-19 15:28:41 -07:00
Tim Abbott 82f78621dd settings: Extract CUSTOM_LOGO_URL. 2016-07-19 15:28:41 -07:00
Tim Abbott de679a23c9 settings: Extract settings.REGISTER_LINK_DISABLED. 2016-07-19 15:28:41 -07:00
Tim Abbott c25b077224 settings: Extract settings.SHOW_OSS_ANNOUNCEMENT. 2016-07-19 15:28:41 -07:00
Tim Abbott fb386da552 settings: Extract settings.SAVE_FRONTEND_STACKTRACES. 2016-07-19 15:28:41 -07:00
Tim Abbott 522ccf8eb2 settings: Extract settings.STAGING_ERROR_NOTIFICATIONS. 2016-07-19 15:28:41 -07:00
Tim Abbott 0aaa55fb8f settings: Extract settings.SHARE_THE_LOVE. 2016-07-19 15:28:41 -07:00
Eklavya Sharma 016a2faa23 Make zproject/local_settings.py pass mypy check. 2016-05-18 17:10:18 +05:30
Tim Abbott 8905216df5 Automate inclusion of urls.py files for EXTRA_INSTALLED_APPS. 
By removing this hardcoding of the list of valid extra apps, we make
it a lot easier to add additional pluggable apps to the Zulip
codebase.
 2016-04-26 21:39:39 -07:00
Tim Abbott 2b30b670e0 Factor out EXTRA_INSTALLED_APPS setting. 2016-04-26 21:28:51 -07:00
Tim Abbott 2ea0663a4a Apply Python 3 futurize transform libmodernize.fixes.fix_imports_six. 2015-11-01 09:26:16 -08:00
Tim Abbott 3efdb7ebf3 Document how to setup the Zulip S3 integration. 2015-09-29 18:11:58 -07:00
Tim Abbott 80fa5006f8 Document the purpose of local_settings.py properly. 2015-09-29 18:05:04 -07:00
Tim Abbott 858d0a984b Move API super users configuration into the database. 
(imported from commit 3cc702f93e7252b42930dba4bde93a915b6dbf44)
 2015-09-20 11:13:20 -07:00
Tim Abbott 36a9dc2cf7 Cleanup various minor Zanitization issues. 
(imported from commit 5784eb5ac70706f72b05463354434a83a6e1beaa)
 2015-09-20 00:25:38 -07:00
Tim Abbott 166192fb57 Add additional missing IP addresses to ALLOWED_HOSTS. 
(imported from commit 4f81101a1df35074947228c259e944c4565061c6)
 2015-09-19 15:51:27 -07:00
Tim Abbott cf1aff661c Add current production IP addresses to ALLOWED_HOSTS. 
(imported from commit c255acb6ad7cd47d8a51509f4c24a05ac06ebd9a)
 2015-09-19 15:13:02 -07:00
Tim Abbott 17fd248f23 Move postgres host configuration for zulip.com out of settings.py. 
(imported from commit fe95011ae86ff7c5f20c789b459a763326da374d)
 2015-08-22 13:49:43 -07:00
Tim Abbott 930c64df8a Move zulip.com-related statsd configuration out of main settings.py. 
This also removes the convenient way to run statsd in the Dev VM,
because we don't anticipate anyone doing that.  It's just 2 lines of
config to configure it anyway:

STATSD_HOST = 'localhost'
STATSD_PREFIX = 'user'

(imported from commit 5b09422ee0e956bc7f336dd1e575634380b8bfa2)
 2015-08-22 13:49:43 -07:00
Tim Abbott 83a653efce Change semantics of ZULIP_COM to include ZULIP_COM_STAGING machines. 
(imported from commit 2e84c756b4ac41c13d619ab6ceb99e347d1f48cb)
 2015-08-21 10:41:14 -07:00
David Roe edf7e732a2 ENTERPRISE => VOYAGER. 
(imported from commit 4f8080b9f506a87ca40bef32e39de5218cba916a)
 2015-08-21 10:33:35 -07:00
David Roe f79adf830f deployed => production 
(imported from commit 2d7b0a7a73b0c84b32634a88af1e0d666139d4ff)
 2015-08-21 10:33:35 -07:00
David Roe d702ddb3cf DEPLOYED => PRODUCTION 
(imported from commit a7d365c07916c5103fc721c712db94f9af977640)
 2015-08-21 10:33:35 -07:00
David Roe 63e576b811 STAGING_DEPLOYED => ZULIP_COM_STAGING 
(imported from commit 25419979292218932c53cface59c1e8e2348a7c2)
 2015-08-21 10:33:35 -07:00
David Roe 24f6743288 Eliminate TESTING_DEPLOYED. 
(imported from commit 477d8b7a15f703df1e10ae5682e02fea5ce040e4)
 2015-08-21 10:33:35 -07:00
David Roe 59b94a901c Moving ALLOWED_HOSTS to local_settings. 
(imported from commit b89c6983fd87ede42954dd84706f999ed0de740d)
 2015-08-21 10:33:35 -07:00
Tim Abbott 80651c99cd Stop using local_settings.py at all in the Dev VM. 
(imported from commit d067bcfe9d71628d8f671c5bc7bb38f521f9a965)
 2015-08-21 10:33:35 -07:00
Tim Abbott 90bfc39d55 Remove dead GoogleBackend from prod configuration. 
(imported from commit 5fcf5c4bdb8d3564819005b624076878b59cd23b)
 2015-08-21 01:42:22 -07:00
Yoyo Zhou 15abf9ed31 Move all remaining calls of get_secret from local_settings.py to settings.py. 
(imported from commit 099a122121f8e06568cef3579f955cb73b20ee50)
 2015-08-20 22:19:26 -07:00
Yoyo Zhou bd5fc484f0 Move GOOGLE_OAUTH2_CLIENT_SECRET to be read in settings.py. 
(imported from commit 814dc32cd6099516486be76fa8baffbafda69596)
 2015-08-20 22:19:17 -07:00
Yoyo Zhou 4b3874988f Move DROPBOX_APP_KEY to be read from get_secrets 
(imported from commit 99acd66c4478a0826b0e0ec7bf26c9a59f7febca)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou ef320c6e95 Remove Redis remote authentication feature. 
We can add it back later but for now we can just stick with localhost
since that's what most people will want.

(imported from commit c5fe524282219dc62a0670f569c0cb6af04be339)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou e41c00107d Move twitter secret keys to use get_secrets in settings.py 
(imported from commit cc21265ae64a49be20bec74386314d60ee822746)
 2015-08-20 21:58:59 -07:00
Yoyo Zhou 32f6d1055d Get s3_key and s3_secret_key from secrets in settings.py. 
(imported from commit 2c2574988486bbb6f0f769250664a5a2a4c9e6c9)
 2015-08-20 21:58:51 -07:00
Yoyo Zhou d34d44e1d4 Read ANDROID_GCM_API_KEY from secrets; move to settings.py 
(imported from commit 0d0d59116065956b9cbbe895eb09f0433b752cf1)
 2015-08-20 21:54:55 -07:00
Yoyo Zhou ec5ed87ca0 Make get_secret return None instead of an exception if the secret isn't defined. 
Remove empty key generation from generate_enterprise_secrets, since get_secret ignores missing keys now.

(imported from commit 32d61e3058f0d41bfb4b17775e581a3c84540fe7)
 2015-08-20 21:54:38 -07:00
Yoyo Zhou 2cab113035 Rename getsecret -> get_secret and remove duplicate secret-reading code in settings.py 
(imported from commit 097d6b4fad1fcf8b6f09dc212056fdb313efe5e4)
 2015-08-20 21:52:26 -07:00
Cat Miller 0a20f168a7 Auto-generate dev-secrets file. 
Source LOCAL_DATABASE_PASSWORD and INITIAL_PASSWORD_SALT from the secrets file.
Fix the creation of pgpass file.

Tim's note: This will definitely break the original purpose of the
tool but it should be pretty easy to add that back as an option.

(imported from commit 8ab31ea2b7cbc80a4ad2e843a2529313fad8f5cf)
 2015-08-20 00:20:44 -07:00
Tim Abbott 2de3e2ebdd Move several secrets to using the get_secret function in settings.py. 
(imported from commit 08fb828265c4a9e35294a51c0901bd5ad3990344)
 2015-08-18 20:17:48 -07:00
Tim Abbott 8c88746912 Move iOS App IDs to settings.py since it's needed to run the app. 
(imported from commit 891e32ffa82430487fc333fa549ee465f0d018c0)
 2015-08-18 20:17:48 -07:00
David Roe 2ffd022a5f Include defaults for AUTHENTICATION_BACKENDS 
(imported from commit cdfffacc45f30e6959085ba8bc5aed72ae3527cf)
 2015-08-18 20:17:47 -07:00