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

9542 Commits

Author SHA1 Message Date
Tim Abbott a8261dd6ac Remove Deployment initialization from Development. 
(imported from commit 4596fcf480c10c88496cd6506edb0a6e702d823c)
 2015-08-21 10:40:57 -07:00
Tim Abbott 16e0f21687 Fix a bunch of Zulip Voyager related comments. 
(imported from commit 176e875cbc310ba00d6137930ddb718bd68f1866)
 2015-08-21 10:40:54 -07:00
Tim Abbott d0afb75619 Clarify documentation for SMTP delivery code. 
(imported from commit 3b13f39fd56e9c381201911479c1326883c38445)
 2015-08-21 10:33:36 -07:00
Tim Abbott d281fc75fd Rename generate_voyager_secrets.py => generate_secrets.py. 
(imported from commit c2f370c3b241601b4f6883d3953ceec1efda71be)
 2015-08-21 10:33:36 -07:00
David Roe e3f38acbce Enterprise => Voyager. 
(imported from commit 41b9a67301aeaf5fd40bbbb8f34a326ca98431fd)
 2015-08-21 10:33:35 -07:00
David Roe 3f7cb34b00 enterprise => voyager 
(imported from commit 04be792bb480d5e5db1c91d296d1000cf1682571)
 2015-08-21 10:33:35 -07:00
David Roe edf7e732a2 ENTERPRISE => VOYAGER. 
(imported from commit 4f8080b9f506a87ca40bef32e39de5218cba916a)
 2015-08-21 10:33:35 -07:00
David Roe f9f1fdc4d7 change deploy_type in zulip.com conf file. 
(imported from commit 6fad28d15f530a619d7359bce0a182ed61b876ab)
 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 8778c4726a Add settings.DEVELOPMENT as a complement of settings.DEPLOYED. 
(imported from commit 0437140d9fee7eec7b28abe583cfe8cde3e07c21)
 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 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 e7dc77426a Django 1.8: record # of queries regression 
I haven't tracked down the cause of this.

(imported from commit 05854d85c870361bd447083a22da780e7ed895f4)
 2015-08-20 23:35:41 -07:00
Reid Barton ae0ae3dde8 Django 1.8: declare positional arguments in management commands 
(imported from commit d9efca1376de92c8187d25f546c79fece8d2d8c6)
 2015-08-20 23:35:40 -07:00
Reid Barton ecc07333af Django 1.8 compatibility: miscellaneous changes 
(imported from commit 086fac44cbdce1986a07e2ade00412dd538b4f23)
 2015-08-20 23:15:45 -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 d88efef74b Fix field name in get_bots_backend 
Django 1.8 noticed that it was wrong.

(imported from commit d9578719e7713c1fd6756b80aac13f4d93f12fa7)
 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 9db521a931 Django 1.8 compatibility: extracting the user from a session 
django commit 596564e80808 stores the user id in the session as a
string, which broke our code that extracts the user id and compares
it to the id of a UserProfile object.

(imported from commit 99defd7fea96553550fa19e0b2f3e91a1baac123)
 2015-08-20 23:15:45 -07:00
Reid Barton 5ea3bf85de Django 1.8 compatibility: module_name -> model_name 
(imported from commit 38ee96c9a8da5b3abfce8ba47f85dd7d59bcb599)
 2015-08-20 23:15:44 -07:00
Reid Barton e65d508907 Update requirements.txt for Django 1.8 
(imported from commit 534e611d9cf61a38c9e1d862e9941cc400c386b9)
 2015-08-20 23:15:44 -07:00
Reid Barton 362f9c6c5f Django 1.7: syncdb and migrate are now synonyms 
(imported from commit b8a1b2476892bab2418240b04deea6aa40ff1b03)
 2015-08-20 23:01:26 -07:00
Reid Barton dfdc34603e Django 1.7 compatibility: handle both response.content and response.streaming_content 
(imported from commit faaaff96819731a334d52b7d715c8ddb7c0d4293)
 2015-08-20 23:01:26 -07:00
Reid Barton 9ded218950 Django 1.7 compatibility: miscellaneous changes 
(imported from commit 1f63d936c3d195acd033bb42fddacd240af3889b)
 2015-08-20 23:01:26 -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
Reid Barton 64cccb2267 Update requirements.txt for Django 1.7 
(imported from commit 9cdcba315c5bc380e15b82850c049b8a02ce50d7)
 2015-08-20 22:44: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
Nemanja Stanarevic d9f111ec28 Added import_dump command to manage.py to import JSON database dumps 
(imported from commit abd410e5299f15c1a5851e87d18664b59837fbb0)
 2015-08-20 21:19:57 -07:00
Jonathan Dahan e95dfd78ed Fix production deployment script. 
(imported from commit 5b8398a0075dc297d3f86c65ce2ef43977e57ecb)
 2015-08-20 20:50:41 -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 95afea9006 Remove enterprise registration form 
(imported from commit 58914685752bff3c9d0e56ffe21bd3cd367e70e7)
 2015-08-20 18:40:34 -07:00
Anders Kaseorg bded0d9d54 Remove corporate beta signup form 
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
 2015-08-20 18:40:34 -07:00
Anders Kaseorg cb88147ca9 Remove corporate marketing page 
(imported from commit 24128853fd78ef9e89df7f3353f45ac2531a42e1)
 2015-08-20 18:40:34 -07:00
Anders Kaseorg 1b5f9e4374 Remove corporate jobs pages 
(imported from commit 3f1789f6a4f90a33ddd2352fab85d3cf751b0f46)
 2015-08-20 18:40:34 -07:00