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

7514 Commits

Author SHA1 Message Date
Tim Abbott fce97df972 api: Fix our handling of the --site option. 
Tested that the following all do the same thing after this patch:

--site=https://ls-dev.zulip.net
--site=https://ls-dev.zulip.net/
--site=https://ls-dev.zulip.net/api
--site=https://ls-dev.zulip.net/api/

(imported from commit 785c005e4b4be3621d7d330a0173023ab2c77a4d)
 2013-11-15 11:10:25 -05:00
Tim Abbott 52ca432745 remote_user_sso: Redirect to EXTERNAL_HOST, rather than a relative /. 
This fixes a problem where the desktop app would attempt to load
https://zulip.akam.ai:8888/ after authenticating the user, which fails
with CSS issues.

We should probably, separately, change our Django-under-apache to only
serve the one URL that it needs and redirect the rest back to
Django-under-nginx.

(imported from commit 3e3251863618269790f61b371e88af57b6cfb272)
 2013-11-15 11:10:19 -05:00
Zev Benjamin 878916d301 blueslip: Fix formating of log date strings 
We weren't padding the parts of the time or date.

(imported from commit 6ce68670f603b58592904ddc1f4be820dda135c3)
 2013-11-15 11:00:56 -05:00
Steve Howell 53e3435a77 [customer] Enable single message narrowing for CUSTOMER10. 
(imported from commit 2734315a3b7bd0a872048406b886d197c3c3cad6)
 2013-11-15 10:46:15 -05:00
Steve Howell 788943887a Resize GROUP PMs more aggressively. 
(imported from commit fbef79f2bb544648fcf4ea26e25354a7ed6912df)
 2013-11-14 20:33:50 -05:00
Steve Howell ee28e5e2f6 Relax 80-char limit on status messages (/me). 
(imported from commit e9de2cb6c394f5b764e988e279f0fb3cfd38c6e8)
 2013-11-14 13:51:07 -08:00
Steve Howell 2074573fe2 Make sure GROUP PMs show up without needing a resize. 
(imported from commit 6c6d79fdd5dfe15e508c430baef5043d9d1d2c93)
 2013-11-14 16:30:57 -05:00
Steve Howell 6e19f8b86f Split humans/bots in History tab for realm reports. 
(imported from commit 02e398590f4f844ce30e76703006262296301b97)
 2013-11-14 15:46:10 -05:00
Zev Benjamin 4d7b351b07 Ensure that restarting get_events does spawn more than one get_events request 
Aborting a xhr actually calls the error callback, which was
restarting the get_events loop, and we were also restarting it
manually in restart_get_updates.

(imported from commit dcdb4a27539ce35ecd83c2ade5b4edca3fb848e1)
 2013-11-14 14:44:37 -05:00
Steve Howell d3579c57ec Avoid scrolling the main page by accident with mousewheel. 
If you used the mousewheel in certain page sub-elements, scrolling
to the bottom would sometimes turn into scrolling the main page.
We had code to make that not happen, but it was sensitive to
integer rounding, so I added a one pixel fudge factor.

(imported from commit 5ed1f4e717e5f9ce3316383812dee27913afdd49)
 2013-11-14 14:29:31 -05:00
Steve Howell 3a7113312c Give some room to GROUP PMs when lots of users. 
When GROUP PMs are in the right sidebar, and when there are
lots of users, we set max heights so that both USERS and
GROUP PMs show up.

(imported from commit 4a5a16a8cf03d853769b3a690ac5b0338a2c8461)
 2013-11-14 14:29:30 -05:00
Steve Howell b7d8f5d43f Move groups (not just users) from right to left sidebar. 
When a user squishes the browser window enough to move users
to the left sidebar, we need to move user groups as well.  More
importantly, when they widen again, we move both of them back
in a way that users stay on top of groups.

(imported from commit d80722b58190d42a2dfc5247bfffaa7708cde21a)
 2013-11-14 14:29:30 -05:00
Steve Howell a2df5f18e9 Add expectOne() checks for sidebar logic. 
(imported from commit b9e729fd37f291d9e3f17edf77117d71fd129f7c)
 2013-11-14 14:29:29 -05:00
Leo Franchi 8511538c46 Change wording of license agreement link 
(imported from commit a6d5ad8375232f8b43092383b75e5c195229a741)
 2013-11-14 14:27:34 -05:00
Jessica McKellar ff4f5e3b71 Add enterprise terms fields for CUSTOMER13 to the registration page. 
(imported from commit f411277196c621265d645538b89a69468a1e3f77)
 2013-11-14 14:21:27 -05:00
Steve Howell 6ddfa35a49 Remove detailed "At risk users" tab 
(imported from commit d5630fa3ae5a35d238e3c947a01e1a648668817f)
 2013-11-14 14:07:24 -05:00
Steve Howell d4c0334b3b Show counts of at-risk users on Activity page. 
(imported from commit 4ce1ecf47259f3a95ddf9cbbc356fa0247044e0f)
 2013-11-14 14:07:24 -05:00
Kevin Mehall bb0d18bc73 Spell Zulip correctly on enterprise form 
(imported from commit a1146320c2992428c51f6ec8d25fc97746e02d27)
 2013-11-14 13:38:58 -05:00
Steve Howell f60fa1b274 Don't linkify "Total" on the main Activity tab. 
(imported from commit 2098f488f1276a022b4c585b99c25c3a5a66ca06)
 2013-11-14 13:28:41 -05:00
Steve Howell 0c74d55d6b Clean up time display on the Activity page. 
(imported from commit fc1d0cad1ed8a70ddf34c29633569ed473430fc8)
 2013-11-14 13:28:41 -05:00
Steve Howell c214691a1e Linkify more realms on the Activity page. 
(imported from commit f9a5ab46ce77b13ff9cf5dcc80231bfb1d11bbee)
 2013-11-14 13:28:40 -05:00
Steve Howell b690918480 Extract user_activity_link() for activity reports. 
(imported from commit 0ae3770a8dcba2bb9fad6a22133635316f74b0d7)
 2013-11-14 13:28:40 -05:00
Tim Abbott 66bbf40b5a Simplify deployment role configuration. 
(imported from commit f9a9cf0ae33e7a74517255f944c91fa9aba14e33)
 2013-11-14 13:01:51 -05:00
acrefoot 4a74425f37 derive DEFAULT_FROM_USER from EMAIL_HOST_USER 
(imported from commit 2358f00a8eddb744392cd8f8f02cbed406e25013)
 2013-11-14 12:57:47 -05:00
Tim Abbott 8b64833b8a Give the first user in a realm admin privileges. 
(imported from commit 9d4c598f76cdbf5cc3b79f1498e9fec2005f08fa)
 2013-11-14 12:39:36 -05:00
Leo Franchi 68954ee89a Show info on how to remove lockdir in upgrade-deployment 
(imported from commit 59984c9b3ce7ef133f0e929836533ae9d6d40707)
 2013-11-14 12:00:03 -05:00
acrefoot f991fbff9e Fix clear_followup_emails_queue on Zulip Enterprise. 
(imported from commit bf211b205bc39a08340306d06fbb76479a02ed9e)
 2013-11-14 11:32:29 -05:00
acrefoot 54d72d9a55 Fix Invitations on ONLY_SSO deploys (Zulip Enterprise) 
(imported from commit 6807adbd39682ba91a5746e8a75d7ce53f632ab3)
 2013-11-14 11:32:29 -05:00
Kevin Mehall b469066e66 Fix emoji on enterprise. 
static/ doesn't exist on enterprise, so we can't get the list from the
files there.

(imported from commit ce34a62478abf541feb013da4f970dac3c09d98a)
 2013-11-14 11:18:23 -05:00
Tim Abbott c24addf2d5 Build internal bots in the zulip.com domain. 
Otherwise do_create_realm can't actually send the notifications.

(imported from commit 4fa9a53f1d3d8a2e26d7b89401e7dfa77f2f7533)
 2013-11-14 11:16:16 -05:00
Tim Abbott e2537ade44 Create the admin realm using do_create_realm. 
That way, we get the first-user message sent automatically.

(imported from commit 70be26a8152676055a94c363706c35964284a3de)
 2013-11-14 11:16:16 -05:00
Tim Abbott af21f943a2 Fix paths to zulip_tools for relocated scripts. 
(imported from commit 9a3664c0f7da1ce6dcb554e7e9ddef5bde6cad7e)
 2013-11-14 11:16:16 -05:00
Tim Abbott ce2da6c18a Use NOTIFICATION_BOT for communicating with users. 
(imported from commit 98afc575259a4487a7fefbd3e8bd91a2a46cc9c9)
 2013-11-14 11:16:15 -05:00
Tim Abbott 3a421e1bd1 Fix create_deployment not actually setting base_site_url. 
(imported from commit cd008060623ad393f02abbb6c5a4dfd9c00c7b41)
 2013-11-14 11:16:15 -05:00
Tim Abbott 844e0948e3 Add license not referring to Zulip Enterprise license agreement. 
(imported from commit 329c06a795b7cc1631a4cdef707a54ee437befe5)
 2013-11-14 11:16:15 -05:00
Tim Abbott ccae6ef5ce Remove unpublished work comment about our SSO example. 
(imported from commit 20585c5caa2e7019e3817d40ea2ab90c13b582e2)
 2013-11-14 11:16:15 -05:00
Leo Franchi ea648d19a1 Rename template vars in zilencer's use of login.html for clarify 
(imported from commit ffd5aa569054fb3949775a7f3e2e02634b814c06)
 2013-11-14 10:56:29 -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
Leo Franchi be3257de62 Add sso sparkle paths and files 
(imported from commit f8a953f4262b170931792ed223f1ddc29c5fe5ed)
 2013-11-14 10:22:35 -05:00
Tim Abbott 9a6f34a807 Make generate_enterprise_secrets.py work regardless of path. 
(imported from commit c1ab8231fbe907a32b18c02a00cee51011abbb21)
 2013-11-14 09:10:10 -05:00
Tim Abbott 037460b24c Fix permissions on install script. 
(imported from commit af71b3a4988059c58e741bf94d0c28383c08f704)
 2013-11-14 08:56:06 -05:00
Tim Abbott 870ae09aae Add setting for disabling inline image preview. 
(imported from commit 2321390eb14cfe5701347861b9ae5ad6fdac0cbb)
 2013-11-14 08:47:11 -05:00
Tim Abbott f9707dd903 Clean up scripts/ by moving helper tools into lib/. 
(imported from commit 31a99d5cc68524a1399daa50eb1fcda54383a317)
 2013-11-14 08:47:11 -05:00
Tim Abbott 9a0ddb644d Improve the copy a bit on local_settings_template.py 
(imported from commit e9f8a87dc824b5c51178be87999e27ed79897388)
 2013-11-14 08:19:21 -05:00
Tim Abbott b2798385ac Organize local_settings_template.py a bit better. 
(imported from commit c880b1237504e81ce828ccaf58dcc383ac0231b6)
 2013-11-14 08:19:21 -05:00
Tim Abbott 042f5a3959 Improve documentation of SSO_APPEND_DOMAIN. 
(imported from commit b91893924c1f64958c361aa83bd042509c8beec6)
 2013-11-14 08:19:21 -05:00
Tim Abbott 486fcfa53f README 
(imported from commit c02dfbd15ab6bac5a450d04075b15a7c44e8ddfe)
 2013-11-14 08:19:20 -05:00
Tim Abbott bd607a32e6 unpack-zulip: Update for zulip-server paths containing versions. 
(imported from commit 9318cab0cfcdf57412afbe9386371c8f9994da9f)
 2013-11-14 08:19:20 -05:00
Tim Abbott 7e64e19cc2 settings: Set ONLY_SSO to False when not enabled. 
(imported from commit fcfe8462aae70dbdff55d245cfd5a6b723cd8378)
 2013-11-14 08:19:20 -05:00
Tim Abbott be99b4438c Don't send stream invite notifications to bots. 
(imported from commit b45ef40b056f451c5085e5fb2afec4bbb68fa3f5)
 2013-11-14 08:19:20 -05:00