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
5ea3bf85de
Django 1.8 compatibility: module_name -> model_name
...
(imported from commit 38ee96c9a8da5b3abfce8ba47f85dd7d59bcb599)
2015-08-20 23:15:44 -07:00
e65d508907
Update requirements.txt for Django 1.8
...
(imported from commit 534e611d9cf61a38c9e1d862e9941cc400c386b9)
2015-08-20 23:15:44 -07:00
362f9c6c5f
Django 1.7: syncdb and migrate are now synonyms
...
(imported from commit b8a1b2476892bab2418240b04deea6aa40ff1b03)
2015-08-20 23:01:26 -07:00
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
9ded218950
Django 1.7 compatibility: miscellaneous changes
...
(imported from commit 1f63d936c3d195acd033bb42fddacd240af3889b)
2015-08-20 23:01:26 -07:00
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
64cccb2267
Update requirements.txt for Django 1.7
...
(imported from commit 9cdcba315c5bc380e15b82850c049b8a02ce50d7)
2015-08-20 22:44:22 -07:00
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
bd5fc484f0
Move GOOGLE_OAUTH2_CLIENT_SECRET to be read in settings.py.
...
(imported from commit 814dc32cd6099516486be76fa8baffbafda69596)
2015-08-20 22:19:17 -07:00
4b3874988f
Move DROPBOX_APP_KEY to be read from get_secrets
...
(imported from commit 99acd66c4478a0826b0e0ec7bf26c9a59f7febca)
2015-08-20 21:58:59 -07:00
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
e41c00107d
Move twitter secret keys to use get_secrets in settings.py
...
(imported from commit cc21265ae64a49be20bec74386314d60ee822746)
2015-08-20 21:58:59 -07:00
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
d34d44e1d4
Read ANDROID_GCM_API_KEY from secrets; move to settings.py
...
(imported from commit 0d0d59116065956b9cbbe895eb09f0433b752cf1)
2015-08-20 21:54:55 -07:00
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
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
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
e95dfd78ed
Fix production deployment script.
...
(imported from commit 5b8398a0075dc297d3f86c65ce2ef43977e57ecb)
2015-08-20 20:50:41 -07:00
58e5c654fa
Make feedback button option default-off.
...
(imported from commit 23b89ab72bd04826016631e01da950af0a5df694)
2015-08-20 19:47:00 -07:00
13f3b448e5
Kill Embed.ly integration.
...
(imported from commit dfe42a26e57100108c3c50298041bd520e0d8b1b)
2015-08-20 19:46:48 -07:00
95afea9006
Remove enterprise registration form
...
(imported from commit 58914685752bff3c9d0e56ffe21bd3cd367e70e7)
2015-08-20 18:40:34 -07:00
bded0d9d54
Remove corporate beta signup form
...
(imported from commit 1b3a0cd8a59a124905fa4cbd3121a78d23aeb3a2)
2015-08-20 18:40:34 -07:00
cb88147ca9
Remove corporate marketing page
...
(imported from commit 24128853fd78ef9e89df7f3353f45ac2531a42e1)
2015-08-20 18:40:34 -07:00
1b5f9e4374
Remove corporate jobs pages
...
(imported from commit 3f1789f6a4f90a33ddd2352fab85d3cf751b0f46)
2015-08-20 18:40:34 -07:00
5c6cd40fe7
recipient_for_emails: Fix type error
...
Fixes
[
File "/srv/zulip/zerver/lib/actions.py", line 605, in recipient_for_emails
if not (normalized_emails & admin_realm_admin_emails or normalized_emails & settings.CROSS_REALM_BOT_EMAILS):
TypeError: unsupported operand type(s) for &: 'set' and 'list'
(imported from commit f39a95dad7b3207e9188fc03926cd116061ef3f3)
2015-08-20 18:40:31 -07:00
36c6f1e731
provision: Do not silence stdout and stderr
...
(imported from commit 58cd23b0d77a26c9961c0c1f9a37433ac0fb9290)
2015-08-20 18:36:34 -07:00
3515a69e43
Remove public_streams_disabled.
...
(imported from commit 1d0c8db92bf8e4c44bd1c96063acfd6eea74925c)
2015-08-20 18:12:53 -07:00
d2979ab5d4
Move main body of provision.py into a function
...
(imported from commit befd4f45bf5876c61456bd2c262bfa9136b514e7)
2015-08-20 18:08:08 -07:00
222ea05a3a
Warn users that twenty-four-hour-time doesn't update without a reload.
...
(imported from commit e3c00082746284fb0e6f9b958a887b9d1a1b86a3)
2015-08-20 17:59:16 -07:00
1880e96a22
Fix tests broken by twenty-four-hour-time feature.
...
(imported from commit 4f6215b303de8e27323141f687e046048f1456b5)
2015-08-20 17:59:16 -07:00
b58867451d
Add dev-secrets.conf generated by latest version of dev VM to gitignore
...
(imported from commit 001bb790e530038fe38cd38550e495c47c5dea92)
2015-08-20 17:33:17 -07:00
4d0f7c7ea4
Add a user-visible setting for 24-hour time display.
...
(imported from commit d934824fd6b72e64a455aac9ff4585b262145f02)
2015-08-20 17:33:16 -07:00
9734d1ab3f
Remove confusing half-implemented retention policy code.
...
(imported from commit 539bd5f0a49a8cb564112d12723526887d955f71)
2015-08-20 17:33:16 -07:00
bfa70675cb
Remove notify_for_streams_by_default.
...
(imported from commit 9963c97ffec82fe7cf2921bd51422545c29a8915)
2015-08-20 17:33:16 -07:00
def426aa34
Remove exceptions for two domains where all streams were private.
...
(imported from commit 1e391a50875091f6a8843d3915a6893f2d903f22)
2015-08-20 17:33:16 -07:00
6176dfd039
Install yui-compressor for building enterprise tarballs.
...
(imported from commit 917d6a5221b5c2c50fc399c9942cb3682e3471ca)
2015-08-20 17:33:16 -07:00
9000d27f12
Update generate_enterprise_secrets to support running in production.
...
(imported from commit 1051f668ebe684cc60ba4444e815ef60398fad61)
2015-08-20 17:33:16 -07:00
e79447131f
Make build-enterprise-tarball run again.
...
(imported from commit e3dd8d75811458d0cee8a2d05a4b47abd6eda7fd)
2015-08-20 17:33:16 -07:00
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
53c2b3f6f4
Clean up vagrant postgres user creation code
...
We don't need to check whether the user exists before creating it:
CREATE USER failing is fine.
(imported from commit e8b2bc5495e328ee30d15445a566c0edff2f069d)
2015-08-20 16:30:21 -07:00
748f931999
Fix postgres users when re-provisioning
...
If we run provision.py a second time, there will already be
zulip/zulip_test users, so the CREATE USER will fail and the password
won't get updated to the newly generated value. By creating the user
and setting the password in two commands, we allow the creation to
fail without affecting whether the password is set.
Also the quoting for updating .pgpass was wrong.
(imported from commit 5e249813c17cb4829e4e4958e92aaa30563c5f96)
2015-08-20 16:30:21 -07:00
dd8eda4edc
run-dev: Run compile-handlebars-templates inside the pgrp
...
(imported from commit bb13f8804b7e9e930ecd2542ea8772c76370d32e)
2015-08-20 15:54:53 -07:00
bd66b2139b
run-dev: Eschew useless shells
...
(imported from commit 34dab15941f5c63f381f5b2b7b78482dbc2b02ea)
2015-08-20 15:54:53 -07:00
664db6b622
Generate more test messages to avoid test failures
...
Sometimes I get the error "Selected message id not in MessageList"
when running the casper tests. I think it's probably when the test
user's home view does not contain any messages.
Ideally we would fix this in a way that guarantees that we generate
whatever messages the test suite needs...
(imported from commit 51a02da612dda88d60681b9e09cd6e6a2c39a470)
2015-08-20 15:43:43 -07:00
8cb7b759c6
Add tests for new realm properties, fix revealed typo.
...
(imported from commit 49ffcf7edc64c2dbc3cf41ed64222390072c2e88)
2015-08-20 15:29:46 -07:00
086d8eee22
Add name_changes_disabled realm field.
...
(imported from commit 6b04ba2f7ad64c44f2ef18302f0fbd819259d632)
2015-08-20 15:29:46 -07:00
5b7f3466ba
Add feature where only admins can invite new users.
...
This is controlled through the admin tab and a new field in the Realms table.
(imported from commit e78a6f48160e2a1bbc68d278beb726fe31515266)
2015-08-20 15:29:46 -07:00
809efc4f2b
Add realm option to show or not show digest e-mail.
...
(imported from commit e9cfe519aa9f2857a1dcc7c75f5e1889834fcb86)
2015-08-20 15:29:45 -07:00
e5cb2a468f
Enable Lab features for all users
...
(imported from commit 4e2658d28a5e02067ad472fec76c66f46592d520)
2015-08-20 15:29:45 -07:00
Reid Barton
Yoyo Zhou
Nemanja Stanarevic
Jonathan Dahan
Tim Abbott
David Roe
Anders Kaseorg
Luke Faraone
Kate Buckner
acrefoot
Reid Barton