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

357 Commits

Author SHA1 Message Date
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 78277b5ee5 Make ADMIN_DOMAIN and ZULIP_ADMINISTRATOR have sane dev defaults. 
(imported from commit 3d2602166541c7eaa72ea7fad87a2dc86f7c8f15)
 2015-08-21 09:01:58 -07:00
Tim Abbott 3e61714035 Make DEPLOYMENT_ROLE_KEY no longer required. 
(imported from commit 046ce610d847cc987d3f6d584ccc0bc84b55df84)
 2015-08-21 09:01:58 -07:00
Tim Abbott 90bfc39d55 Remove dead GoogleBackend from prod configuration. 
(imported from commit 5fcf5c4bdb8d3564819005b624076878b59cd23b)
 2015-08-21 01:42:22 -07:00
Reid Barton ab9539cffe Remove OpenID authentication 
(imported from commit 70a859041a851ed10dc40cfc068330e472d2ed09)
 2015-08-20 23:52:48 -07:00
Reid Barton 15fe02b618 Remove authhack 
In Django 1.8 the username length limit seems to be 254 by default.

(imported from commit cf0027431f5a4fea9e366a49d345b9d09b90d869)
 2015-08-20 23:15:45 -07:00
Reid Barton 0aab583bb1 Django 1.8 compatibility: transactions 
- autocommit is now the default
- commit_on_success is now atomic

(imported from commit b6166ca666ff23d34f2871ca365ce3ec66b0fa86)
 2015-08-20 23:15:45 -07:00
Reid Barton 599742536b Switch from South to native Django migrations 
This commit loses some indexes, unique constraints etc. that were
manually added by the old migrations. I plan to add them to a new
migration in a subsequent commit.

(imported from commit 4bcbf06080a7ad94788ac368385eac34b54623ce)
 2015-08-20 23:01:26 -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
Tim Abbott 58e5c654fa Make feedback button option default-off. 
(imported from commit 23b89ab72bd04826016631e01da950af0a5df694)
 2015-08-20 19:47:00 -07:00
David Roe 13f3b448e5 Kill Embed.ly integration. 
(imported from commit dfe42a26e57100108c3c50298041bd520e0d8b1b)
 2015-08-20 19:46:48 -07:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form 
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
 2015-08-20 18:40:34 -07:00
Kate Buckner 4d0f7c7ea4 Add a user-visible setting for 24-hour time display. 
(imported from commit d934824fd6b72e64a455aac9ff4585b262145f02)
 2015-08-20 17:33:16 -07:00
Tim Abbott e79447131f Make build-enterprise-tarball run again. 
(imported from commit e3dd8d75811458d0cee8a2d05a4b47abd6eda7fd)
 2015-08-20 17:33:16 -07:00
acrefoot 0a6bb975c3 Replace settings.OG_ZULIPER_EMAILS with database lookups 
Also renames the OG_ZULIPER_EMAILS to CROSS_REALM_BOT_EMAILS

(imported from commit a9e0ccebbd6b37376e535600670ad493dc8de7e1)
 2015-08-20 17:20:41 -07:00
Anders Kaseorg 7cd1d9665d test_settings: set CAMO_KEY = 'dummy' to make tests pass 
(imported from commit d8705d8bbcad365b6b94a456d1942a8afc1a32d4)
 2015-08-20 11:07:52 -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 86278804c9 Use the EmailAuthBackend for the test suite. 
(imported from commit 2f7bf9864991358e9dabacbd2b0f652a9f69230c)
 2015-08-19 23:34:30 -07:00
Jonathan Dahan 6f77e68622 Add GET /export endpoint, which dumps important tables in json. 
Meant to be used in tandem with the manage.py import command.
The following sensitive data is scrubbed:

  * user api keys
  * user password hashes
  * stream email keys
  * invite-only streams
  * messages from invite-only streams
  * messages from users from other domains

(imported from commit 8e58dcdcb80ef1c7127d3ab15accf40c6187633f)
 2015-08-19 15:31:08 -07:00
Tim Abbott 7cffb41e13 Reorganize and document settings.py. 
(imported from commit e2694979d5aee95c22b83b7aa84d80b56ffae1d6)
 2015-08-18 20:57:35 -07:00
Tim Abbott 5b8894cd25 Rename USING_SSO to something more clear. 
(imported from commit 94e8ae84b01419783872a5d09bafe5c2eb933c18)
 2015-08-18 20:48:15 -07:00
Tim Abbott 05b0cbb36a Zulip doesn't use MEDIA_URL. 
(imported from commit ebc370d9c5cf2d7e7d366cbb25fe721c817f212e)
 2015-08-18 20:48:15 -07:00
Tim Abbott dcc3b3fe37 Don't create Zulip employee accounts automatically in Dev VM. 
(imported from commit 378f12d3f2ac4c131919c0efbd049b9eaa961694)
 2015-08-18 20:46:35 -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
Tim Abbott 43c7ff64d1 Remove unused FULL_NAVBAR configuration setting. 
(imported from commit 47c3be669f7ba44426301a46e3f54054f3e2440b)
 2015-08-18 20:17:48 -07:00
Tim Abbott 0dae10eab4 Remove unused secret HASH_SALT. 
(imported from commit 831c4cb7680b7bf8dadbd930195175e9a4186356)
 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
David Roe 78f32dcbd8 Fix bug in dev login which showed email/password prompts on logins after the first. 
(imported from commit 626684ef1da8feb53aca05c9225ee628156f9810)
 2015-08-18 20:17:47 -07:00
David Roe 46e224997e Add a new dev login page for logging in without a password on the dev VM. 
(imported from commit ac8f2504771c9907b7e92dc91cec5f7220ce951b)
 2015-08-18 20:17:47 -07:00
Tim Abbott 29ed28af00 Fix ZulipRemoteUserBackend for activating mirror dummies. 
If you're using e.g. our Jabber<=>Zulip mirroring capability along
with the RemoteUser SSO integration, previously it would fail if a
user with a corresponding dummy user tried to login/signup (since they
didn't have an account but one wouldn't be created because
ZulipRemoteUserBackend was reporting that an account already existed).

(imported from commit 006eaa9afa8feedddd860c2bef41e604285228a7)
 2015-08-18 11:28:36 -07:00
Luke Faraone f5089e535d Add dummy secrets for use in development. 
We also reference these secrets from zproject/local_settings.py, keying
off IS_DEPLOYED.

(imported from commit eb83310e219616ed1c6c253f0d6893134bbe3517)
 2015-08-16 21:35:34 -07:00
Luke Faraone 48f1a84d6e Additional defaults for dev. 
(imported from commit 1b4bd71ff4ed27a83a24e58e797d900a7869c72d)
 2015-08-16 16:46:08 -07:00
Luke Faraone 8ea139c772 Fix bugdown fixture for dummy camo key 
(imported from commit 698b261918457117a01ce51f69d49f54f35b3297)
 2015-08-16 16:45:15 -07:00
Zev Benjamin 466a678c2c Remove "More messages below" indicator 
It's been very buggy for a while, has limited usefulness compared with
unread counts, and profiling over the weekend indicates that it's very
slow.

(imported from commit 716fe47f2bbec1bd8a6e4d265ded5c64efe2ad5c)
 2015-03-30 15:44:36 -07:00
Leo Franchi d865732e0d Maintain two APNS connections and send correct notifications to each 
Now we have 2 different Zulip apps out there, and they are signed with
two certs: Zulip and Dropbox. The Dropbox-signed apps are going to need
to be sent APNS notifications from the appropriate APNS connection

(imported from commit 6db50c5811847db4f08e5c997c7bbb4b46cfc462)
 2015-02-11 06:57:25 +00:00
Luke Faraone 910429f365 Move secrets to their own file 
(imported from commit 4e46f217e8a1df9b7cc03db9dc9fc41a6c273365)
 2015-02-10 17:31:26 -08:00
Jason Michalski 15713964a5 Add the notification-bot to the cross realm PM whitelist 
(imported from commit 92a19f955a99650c79b83c6afb23726caf02e577)
 2015-02-08 21:03:45 -08:00
Jason Michalski a0a537e0ce Add the feedback bot to OG_ZULIPER_EMAILS 
The feedback bot needs to be included in the OG_ZULIPER_EMAILS so users
can send feedback.

(imported from commit b0c3295379d0f062a912f8b6c957419335be1c48)
 2015-02-08 10:08:32 -08:00
Jason Michalski f4239d60ca Add pagerduty webhook 
(imported from commit 06219066b423f53d08094f3f97a98016e145b2a7)
 2015-02-07 18:16:11 -08:00
Jason Michalski 1eebcb472d Only allow users in the OG zuliper list to send cross realm PMs 
Changes from allowing all of the zulip realms to a whitelist of users.

(imported from commit 5ad2db9a62b430ef2c9d867e4afdf661b11ae96a)
 2015-01-30 23:39:47 -08:00
Zev Benjamin 2c760ae735 Remove mixpanel 
(imported from commit 9b6cc58ee9be483db8bf2d2eaaaecabc14f821e4)
 2015-02-06 13:59:30 -08:00