2e5eec5bd3
install: Remove apache restart from install process.
...
We don't use apache in the main app -- only for the SSO situation --
this code was just copied from our own install script. And it caused
problems at CUSTOMER13 because they installed Apache in preparation for
the SSO integration, but restarting it failed.
(imported from commit 3f2961574134847c836e8b69736f60d9f8790201)
2013-11-15 15:04:13 -05:00
6826ef4e9a
puppet: Switch from nginx to nginx-full.
...
(imported from commit 38dd5966d75946842b39e4e619d82ebbb0fb041c)
2013-11-15 15:04:13 -05:00
593485e753
Expose hooks for file upload UI control for desktop app
...
(imported from commit c196363a411e0a9c499d9bb694ab539f2ab0e365)
2013-11-15 14:42:31 -05:00
220678ae40
Support emojis/bolding/etc. in single-line /me messages.
...
(imported from commit c62ae8cf26117e30a029e025021cc4a3a67f4a83)
2013-11-15 14:34:38 -05:00
fe0dcd4313
Disable camo on enterprise.
...
CUSTOMER13 doesn't want it, and there's currently no nginx config
or configurable Camo URI, so it wouldn't work if image preview
were enabled.
(imported from commit 615d4a32acbc4d4d590f88cf4e7d45d8f49db1d3)
2013-11-15 14:27:16 -05:00
b0209fec05
Don't puke on non-ASCII characters when shelling out to html2text.
...
(imported from commit a407c9fb2a090075d5e26b5db00388f4f81de1f5)
2013-11-15 12:28:30 -05:00
545e2539f8
Use non-ASCII characters in Freshdesk tests, to catch encoding bugs.
...
(imported from commit 0cc3ebf3548b28c018d75d51e7e66de5dbb59a0b)
2013-11-15 12:28:30 -05:00
b0d1d774e3
enterprise: Don't include templates/zilencer in our tarballs
...
(imported from commit 945a2bd73f1968f06307539bae1c91f977fa0353)
2013-11-15 11:53:49 -05:00
974159ec94
Move apache2 restart for SSO sites to restart-server
...
(imported from commit f999e2b0591a11442c1d3fdba2393ecf6e78bad3)
2013-11-15 11:34:48 -05:00
7f2936a985
Allow enterprise customers to disable name changes
...
(imported from commit 1f2039f3e88a4ec0cc48dba75f714563c1de4af8)
2013-11-15 11:26:10 -05:00
b12649e548
Fix browser error markdown formatting
...
(imported from commit ce793676d6118d86a8aee4f3aae1bc728b0cd8fd)
2013-11-15 11:22:58 -05:00
53c76aa657
Move enterprise-registration to zilencer/ from zerver/
...
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
2013-11-15 11:21:52 -05:00
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
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
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
53e3435a77
[customer] Enable single message narrowing for CUSTOMER10.
...
(imported from commit 2734315a3b7bd0a872048406b886d197c3c3cad6)
2013-11-15 10:46:15 -05:00
788943887a
Resize GROUP PMs more aggressively.
...
(imported from commit fbef79f2bb544648fcf4ea26e25354a7ed6912df)
2013-11-14 20:33:50 -05:00
ee28e5e2f6
Relax 80-char limit on status messages (/me).
...
(imported from commit e9de2cb6c394f5b764e988e279f0fb3cfd38c6e8)
2013-11-14 13:51:07 -08:00
2074573fe2
Make sure GROUP PMs show up without needing a resize.
...
(imported from commit 6c6d79fdd5dfe15e508c430baef5043d9d1d2c93)
2013-11-14 16:30:57 -05:00
6e19f8b86f
Split humans/bots in History tab for realm reports.
...
(imported from commit 02e398590f4f844ce30e76703006262296301b97)
2013-11-14 15:46:10 -05:00
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
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
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
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
a2df5f18e9
Add expectOne() checks for sidebar logic.
...
(imported from commit b9e729fd37f291d9e3f17edf77117d71fd129f7c)
2013-11-14 14:29:29 -05:00
8511538c46
Change wording of license agreement link
...
(imported from commit a6d5ad8375232f8b43092383b75e5c195229a741)
2013-11-14 14:27:34 -05:00
ff4f5e3b71
Add enterprise terms fields for CUSTOMER13 to the registration page.
...
(imported from commit f411277196c621265d645538b89a69468a1e3f77)
2013-11-14 14:21:27 -05:00
6ddfa35a49
Remove detailed "At risk users" tab
...
(imported from commit d5630fa3ae5a35d238e3c947a01e1a648668817f)
2013-11-14 14:07:24 -05:00
d4c0334b3b
Show counts of at-risk users on Activity page.
...
(imported from commit 4ce1ecf47259f3a95ddf9cbbc356fa0247044e0f)
2013-11-14 14:07:24 -05:00
bb0d18bc73
Spell Zulip correctly on enterprise form
...
(imported from commit a1146320c2992428c51f6ec8d25fc97746e02d27)
2013-11-14 13:38:58 -05:00
f60fa1b274
Don't linkify "Total" on the main Activity tab.
...
(imported from commit 2098f488f1276a022b4c585b99c25c3a5a66ca06)
2013-11-14 13:28:41 -05:00
0c74d55d6b
Clean up time display on the Activity page.
...
(imported from commit fc1d0cad1ed8a70ddf34c29633569ed473430fc8)
2013-11-14 13:28:41 -05:00
c214691a1e
Linkify more realms on the Activity page.
...
(imported from commit f9a5ab46ce77b13ff9cf5dcc80231bfb1d11bbee)
2013-11-14 13:28:40 -05:00
b690918480
Extract user_activity_link() for activity reports.
...
(imported from commit 0ae3770a8dcba2bb9fad6a22133635316f74b0d7)
2013-11-14 13:28:40 -05:00
66bbf40b5a
Simplify deployment role configuration.
...
(imported from commit f9a9cf0ae33e7a74517255f944c91fa9aba14e33)
2013-11-14 13:01:51 -05:00
4a74425f37
derive DEFAULT_FROM_USER from EMAIL_HOST_USER
...
(imported from commit 2358f00a8eddb744392cd8f8f02cbed406e25013)
2013-11-14 12:57:47 -05:00
8b64833b8a
Give the first user in a realm admin privileges.
...
(imported from commit 9d4c598f76cdbf5cc3b79f1498e9fec2005f08fa)
2013-11-14 12:39:36 -05:00
68954ee89a
Show info on how to remove lockdir in upgrade-deployment
...
(imported from commit 59984c9b3ce7ef133f0e929836533ae9d6d40707)
2013-11-14 12:00:03 -05:00
f991fbff9e
Fix clear_followup_emails_queue on Zulip Enterprise.
...
(imported from commit bf211b205bc39a08340306d06fbb76479a02ed9e)
2013-11-14 11:32:29 -05:00
54d72d9a55
Fix Invitations on ONLY_SSO deploys (Zulip Enterprise)
...
(imported from commit 6807adbd39682ba91a5746e8a75d7ce53f632ab3)
2013-11-14 11:32:29 -05:00
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
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
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
af21f943a2
Fix paths to zulip_tools for relocated scripts.
...
(imported from commit 9a3664c0f7da1ce6dcb554e7e9ddef5bde6cad7e)
2013-11-14 11:16:16 -05:00
ce2da6c18a
Use NOTIFICATION_BOT for communicating with users.
...
(imported from commit 98afc575259a4487a7fefbd3e8bd91a2a46cc9c9)
2013-11-14 11:16:15 -05:00
3a421e1bd1
Fix create_deployment not actually setting base_site_url.
...
(imported from commit cd008060623ad393f02abbb6c5a4dfd9c00c7b41)
2013-11-14 11:16:15 -05:00
844e0948e3
Add license not referring to Zulip Enterprise license agreement.
...
(imported from commit 329c06a795b7cc1631a4cdef707a54ee437befe5)
2013-11-14 11:16:15 -05:00
ccae6ef5ce
Remove unpublished work comment about our SSO example.
...
(imported from commit 20585c5caa2e7019e3817d40ea2ab90c13b582e2)
2013-11-14 11:16:15 -05:00
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
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
Leo Franchi
Steve Howell
Kevin Mehall
Jessica McKellar
Zev Benjamin
acrefoot