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

7536 Commits

Author SHA1 Message Date
acrefoot ccb7446d5c move Enterprise Email options into better places 
(imported from commit f205c29b224f31474e2983c7f2bdb1ee5e2c754b)
 2013-11-15 21:31:37 -05:00
Tim Abbott 4116e06c88 Disable signups for realms that exist as part of enterprise deployments. 
(imported from commit 4200b44c7153d1dba674982916ef0470c75bdf6d)
 2013-11-15 19:36:17 -05:00
Jeff Arnold d0622e796c Simplify the UI by removing the user's own name and avatar 
(imported from commit 60d6ff1d677e3efe31e68df2c4387ddd2bd8084d)
 2013-11-15 18:48:51 -05:00
Jeff Arnold a9a4b018d0 Simplify the UI by removing the word narrow from the search bar 
(imported from commit 46890e4bfded5ce67adc3f2cd0c68820a052c6d0)
 2013-11-15 18:41:02 -05:00
Tim Abbott 259dca9508 puppet: Merge the ports.conf into zulip-sso.example. 
This makes us not blow away a customer's ports.conf configuration on
upgrade if they needed to change it while setting up their SSO.

Also we change the NameVirtualHost line to better match the
VirtualHost line.

(imported from commit fd52e00c35afa8982e0377859ad794085ec2af80)
 2013-11-15 18:13:09 -05:00
Tim Abbott f941644099 Don't cache templates in development. 
(imported from commit 986df6aecb7e638eb0e017654553e812ac6e0ed2)
 2013-11-15 18:13:09 -05:00
Jessica McKellar 30e4de6767 Freshdesk: fix erroring on unknown statuses by hardcoding FlightCar's. 
(imported from commit 0a4b8ccaa883048fdc7a7d7712cc528194775d89)
 2013-11-15 17:43:55 -05:00
Zev Benjamin a363b7185d restart-server: Use 'all' instead of specifying the supervisor jobs to operate on explicitly 
This shaves about 1.5 seconds off our restart time on ls-dev (9s ->
7.5s).  Still too slow, but it's a little bit better.

(imported from commit acef4c0027b77053497ef6e9f7aa4b61703205c3)
 2013-11-15 15:23:02 -05:00
Tim Abbott 337c22f9e1 Fix redirects landing newly registered users at :8888/accounts/do_confirm. 
This is similar to the related issue we had with the remote_user_sso
codepath.

(imported from commit 5c2c99be9699a1bce88c4a7de15dae4348fc7967)
 2013-11-15 15:04:13 -05:00
Tim Abbott 1b009c47fc Clean up our nginx configuraiton to make better use of app.d. 
Now app.d is something that any app frontend will read, and we just
have secondary manifests add additional files to the app.d directory
for custom stuff.

This fixes the issue that we were incorrectly including the
lb0-related app configuration in the enterprise version.

(imported from commit dec8dcdf2506b82e51186ff936c26dc1cd6cf61b)
 2013-11-15 15:04:13 -05:00
Tim Abbott 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
Tim Abbott 6826ef4e9a puppet: Switch from nginx to nginx-full. 
(imported from commit 38dd5966d75946842b39e4e619d82ebbb0fb041c)
 2013-11-15 15:04:13 -05:00
Leo Franchi 593485e753 Expose hooks for file upload UI control for desktop app 
(imported from commit c196363a411e0a9c499d9bb694ab539f2ab0e365)
 2013-11-15 14:42:31 -05:00
Steve Howell 220678ae40 Support emojis/bolding/etc. in single-line /me messages. 
(imported from commit c62ae8cf26117e30a029e025021cc4a3a67f4a83)
 2013-11-15 14:34:38 -05:00
Kevin Mehall 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
Jessica McKellar 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
Jessica McKellar 545e2539f8 Use non-ASCII characters in Freshdesk tests, to catch encoding bugs. 
(imported from commit 0cc3ebf3548b28c018d75d51e7e66de5dbb59a0b)
 2013-11-15 12:28:30 -05:00
Zev Benjamin b0d1d774e3 enterprise: Don't include templates/zilencer in our tarballs 
(imported from commit 945a2bd73f1968f06307539bae1c91f977fa0353)
 2013-11-15 11:53:49 -05:00
Zev Benjamin 974159ec94 Move apache2 restart for SSO sites to restart-server 
(imported from commit f999e2b0591a11442c1d3fdba2393ecf6e78bad3)
 2013-11-15 11:34:48 -05:00
Leo Franchi 7f2936a985 Allow enterprise customers to disable name changes 
(imported from commit 1f2039f3e88a4ec0cc48dba75f714563c1de4af8)
 2013-11-15 11:26:10 -05:00
Kevin Mehall b12649e548 Fix browser error markdown formatting 
(imported from commit ce793676d6118d86a8aee4f3aae1bc728b0cd8fd)
 2013-11-15 11:22:58 -05:00
Kevin Mehall 53c76aa657 Move enterprise-registration to zilencer/ from zerver/ 
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
 2013-11-15 11:21:52 -05:00
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