paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-30 19:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,778 Commits 30 Branches 160 Tags
5f275c98682e432b2dff0b7579f3da2143b3969f
Commit Graph

32 Commits

Author SHA1 Message Date
Tim Abbott
5f275c9868 Re-enable mobile app advertisements in /apps.html. 2016-08-02 16:45:11 -07:00
Tim Abbott
51672f9ddc Remove now-unused zulip_com template context variable. 2016-07-29 20:47:42 -07:00
acrefoot
e568dbc76f Add TERMS_OF_SERVICE setting. 
This new setting allows the server administrator to add a custom
Terms of Service page by supplying the path to a markdown file.

Also adds a test.
 2016-07-29 20:47:31 -07:00
Umair Khan
80d62de40a Add GitHub authentication. 
Fixes: #1042
 2016-07-29 12:49:10 -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
Vishnu Ks
ff66ce780a Mention emails are printed in run-dev.py console. 
Fixes: #1046
 2016-06-20 11:07:20 -07:00
Vishnu Ks
ad1c3894d9 Add interface for creating new realms. 
This is controlled by settings.OPEN_REALM_CREATION; if that setting is
off, this feature doesn't do anything.
 2016-06-17 16:15:28 -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
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
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
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
Zev Benjamin
2c760ae735 Remove mixpanel 
(imported from commit 9b6cc58ee9be483db8bf2d2eaaaecabc14f821e4)
 2015-02-06 13:59:30 -08:00
Zev Benjamin
2e1d5ffd1c Make password_auth_enabled() take a realm object 
This will actually be used in an upcoming commit.

(imported from commit 5d3db685a245899b2523440398f2ed2f0cfec4f4)
 2014-04-04 16:51:32 -07:00
Tim Abbott
bd68884607 Fix documentation for email gateway on Zulip Enterprise. 
(imported from commit 82e706b4e8e82df3044e5fc3df70e46b2183bc56)
 2013-12-04 16:39:39 -05:00
Tim Abbott
feaf6843de Only document email integration if it is enabled. 
(imported from commit d1f13ff30c56f7a2156e8c00621b6b955302ccf0)
 2013-12-04 16:35:38 -05:00
Tim Abbott
a33eb6f61f Update API documentation to use proper URLs for enterprise. 
(imported from commit cbf9fba4b8281e8ce7a6dd2964c921d2ef906559)
 2013-12-04 15:10:54 -05:00
Leo Franchi
5fd97e48c3 Show a SSO login page for SSO users that just has a login button 
(imported from commit 0004bf8710491f4e2d967b4367b37d57833845ee)
 2013-11-14 10:56:07 -05:00
Tim Abbott
e64472cd32 Rename enterprise template variable to not_enterprise. 
The problem here is that some error-related templates render without
the context managers that we specify, and so we want the handling of
"the context was not set" to default to the enterprise case (because
the enterprise version will work basically fine on !enterprise, but
the opposite is not true because the enterprise distribution doesn't
even have the templates for certain !enterprise pages that may be
linked to).

(imported from commit 7547311d87e048d33221587f44b82fe0ba320ca1)
 2013-11-13 20:10:33 -05:00
Kevin Mehall
53520b85e6 Change our login links to go to the SSO login page on SSO sites. 
(imported from commit 2bccde3846dafd3373db89f507cf63f394d6d7cf)
 2013-11-13 17:54:43 -05:00
Tim Abbott
5293cdebe8 Rename LOCAL_SERVER to ENTERPRISE. 
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
 2013-11-12 15:57:01 -05:00
Kevin Mehall
4a6b7cb20b Disable password change when SSO is the only login option 
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
 2013-11-12 10:37:33 -05:00
Leo Franchi
6765ec0795 Use a site-specific Zulip Admin email in django error pages 
(imported from commit 2d5415d7cd81befc3051b5de3835c0cd258b6375)
 2013-11-04 16:35:50 -05:00
Leo Franchi
8e05f76511 Only enable analytics and dropbox on non-LOCAL_SERVER 
(imported from commit 1ba877550b3afde51bec6f344762ea998800c5b6)
 2013-10-29 17:33:36 -04:00
Waseem Daher
66f48288b4 Rename LOCALSERVER -> LOCAL_SERVER. 
(imported from commit b3abdd10d54d2ad7a9c463af9a291d2e2127707f)
 2013-10-25 17:37:06 -04:00
Luke Faraone
70e161db01 Make settings.LOCALSERVER available as localserver inside templates 
(imported from commit 4f0cfd1f1015061942f603cbc03a253a713a9f83)
 2013-10-25 13:31:13 -04:00
Tim Abbott
e111a2f9a5 [manual] Rename Django app from zephyr to zerver. 
This needs to be deployed to both staging and prod at the same
off-peak time (and the schema migration run).

At the time it is deployed, we need to make a few changes directly in
the database:

(1) UPDATE django_content_type set app_label='zerver' where app_label='zephyr';
(2) UPDATE south_migrationhistory set app_name='zerver' where app_name='zephyr';

(imported from commit eb3fd719571740189514ef0b884738cb30df1320)
 2013-08-06 07:39:36 -04:00