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

1684 Commits

Author SHA1 Message Date
Tim Abbott d0afb75619 Clarify documentation for SMTP delivery code. 
(imported from commit 3b13f39fd56e9c381201911479c1326883c38445)
 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 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
Tim Abbott 3e61714035 Make DEPLOYMENT_ROLE_KEY no longer required. 
(imported from commit 046ce610d847cc987d3f6d584ccc0bc84b55df84)
 2015-08-21 09:01:58 -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 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 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
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
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
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
Anders Kaseorg 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
David Roe 3515a69e43 Remove public_streams_disabled. 
(imported from commit 1d0c8db92bf8e4c44bd1c96063acfd6eea74925c)
 2015-08-20 18:12:53 -07:00
Tim Abbott 1880e96a22 Fix tests broken by twenty-four-hour-time feature. 
(imported from commit 4f6215b303de8e27323141f687e046048f1456b5)
 2015-08-20 17:59:16 -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 9734d1ab3f Remove confusing half-implemented retention policy code. 
(imported from commit 539bd5f0a49a8cb564112d12723526887d955f71)
 2015-08-20 17:33:16 -07:00
David Roe bfa70675cb Remove notify_for_streams_by_default. 
(imported from commit 9963c97ffec82fe7cf2921bd51422545c29a8915)
 2015-08-20 17:33:16 -07:00
David Roe def426aa34 Remove exceptions for two domains where all streams were private. 
(imported from commit 1e391a50875091f6a8843d3915a6893f2d903f22)
 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
David Roe 8cb7b759c6 Add tests for new realm properties, fix revealed typo. 
(imported from commit 49ffcf7edc64c2dbc3cf41ed64222390072c2e88)
 2015-08-20 15:29:46 -07:00
David Roe 086d8eee22 Add name_changes_disabled realm field. 
(imported from commit 6b04ba2f7ad64c44f2ef18302f0fbd819259d632)
 2015-08-20 15:29:46 -07:00
David Roe 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
David Roe 809efc4f2b Add realm option to show or not show digest e-mail. 
(imported from commit e9cfe519aa9f2857a1dcc7c75f5e1889834fcb86)
 2015-08-20 15:29:45 -07:00
David Roe e5cb2a468f Enable Lab features for all users 
(imported from commit 4e2658d28a5e02067ad472fec76c66f46592d520)
 2015-08-20 15:29:45 -07:00
David Roe 90e2f5053f Add mandatory topics as a realm option. 
(imported from commit 929a884b8610669aa24a167367b899683e33a045)
 2015-08-20 15:29:45 -07:00
Reid Barton 5a747ab690 Make the CasperJS frontend tests work again 
(At least when PhantomJS doesn't crash...)

(imported from commit 62936b12883e4c6bbd3701da80783b4bffe46025)
 2015-08-20 13:33:07 -07:00
David Roe dedc83e5dd Switch links on login page to the register page in Dev VM. 
(imported from commit 16e285b2d8f3c5124eaef0b20aa1097d4a1934d0)
 2015-08-19 22:24:53 -07:00
David Roe 472898cfc6 Allow adding users to realms more easily in Dev VM. 
Include new field on Realm to control whether e-mail invitations are required
separately from whether the e-mail domain must match.
Allow control of these fields from admin panel.
Update logic in registration page to use these fields.

(imported from commit edc7f0a4c43b57361d9349e258ad4f217b426f88)
 2015-08-19 22:24:53 -07:00
David Roe 32783ebbfb Admin users in red, at beginning, in dev login view 
(imported from commit 530f0a5d26d5c2b637834281e45adb399852ae0a)
 2015-08-19 22:24:53 -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
Yoyo Zhou 5f74e6e76d Fix a lint warning in notifications.py caught by newer pyflakes (0.9.1) 
zerver/lib/notifications.py:353: list comprehension redefines 'msg' from line 336

(imported from commit 094a21616f8fe7ffe05719c6de6449ade5c43517)
 2015-08-19 11:43:49 -07:00
Tim Abbott 43c7ff64d1 Remove unused FULL_NAVBAR configuration setting. 
(imported from commit 47c3be669f7ba44426301a46e3f54054f3e2440b)
 2015-08-18 20:17:48 -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
Tim Abbott f792b67098 Fix send_to_prod redirect to not run on the Dev VM. 
(imported from commit 6006c71348706d39740b0d6302df0a548e65b65e)
 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
Luke Faraone 494d02cc35 Skip S3 write/read test cases 
(imported from commit 838c9a5245b45fc9082f753fe6756f270c7378a7)
 2015-08-16 16:45:15 -07:00
Luke Faraone 8ea139c772 Fix bugdown fixture for dummy camo key 
(imported from commit 698b261918457117a01ce51f69d49f54f35b3297)
 2015-08-16 16:45:15 -07:00