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

226 Commits

Author SHA1 Message Date
acrefoot e2c388c49c Attempt 2: Notifications in the composebox 
This moves the notify-not-in-view notifications into the composebox area.
It also tries to be a bit smarter about what action it links and what it displays.

(imported from commit 1c79bd0d9ef972059a006b17501a09b72e961ee3)
 2013-11-18 16:09:34 -05:00
Leo Franchi 818ef42d05 Show zulip-desktop-sso package for local server installs 
(imported from commit d0a05bfb2e7a15c02c0e61d6b95ef841a44340b3)
 2013-11-18 12:04:43 -05:00
Waseem Daher 35dd1153ea Don't use a spinner in the "Create bot" form. 
Just disabling the button with a status message is probably
sufficient.

(imported from commit dd46e5ac3d2224d84dc32d057469c434007001fa)
 2013-11-16 13:03:56 -06:00
Waseem Daher dd6f1c981f Properly align "create bot" button on settings form. 
Also move the "Adding bot..." spinner a little.

(imported from commit 65aa869e71a33a23f77d8bb054bbd0fe8e6a7de2)
 2013-11-16 12:53:39 -06:00
Waseem Daher 5327e41156 Reindent settings page bot form. 
There are no changes here, just whitespace changes.

(imported from commit 2681e22ac6a3d256ffbed0a747d1eda57e7fd149)
 2013-11-16 12:43:14 -06:00
Waseem Daher 6b0584742f Remove stray <hr> in password reset form. 
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
 2013-11-16 12:39:26 -06:00
Tim Abbott 9e8346f6d7 Display owners for bots on the admin page. 
(imported from commit d1a80ab8f784ab7e7249cc020b1980bd45434abd)
 2013-11-16 11:35:26 -05:00
Tim Abbott b55e406f93 Display deactivated users at the bottom of the admin users page. 
(imported from commit 1a5d5d64fffc9ed7633d468b975dd56c28f85ccf)
 2013-11-16 11:35:26 -05:00
Tim Abbott c1ddc0908f Admin: Put bots in a separate table. 
(imported from commit 21330e28b486e10aff6af5f48280ea675cbd5697)
 2013-11-16 11:35:26 -05:00
acrefoot 5d14105d1f /hello is sacred, even on Zulip Enterprise 
I broke Zulip Enterprise because I tried to make the /hello link in our day1 email
point to the local server (EXTERNAL_HOST).

(imported from commit 70262b34474ae292ecf9cfe59bebc3c7de904926)
 2013-11-15 22:34:24 -05:00
acrefoot bafb6f8dc3 fixup day1/day2 email templates 
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
 2013-11-15 21:51:37 -05:00
acrefoot daffe049ad Don't use hardcoded noreply@zulip.com, zulip@zulip.com, or https://zulip.com 
(imported from commit 1132553b63ae23ebcca746f0f65205b97bfee7dc)
 2013-11-15 21:31:37 -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
Kevin Mehall 53c76aa657 Move enterprise-registration to zilencer/ from zerver/ 
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
 2013-11-15 11:21:52 -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
Kevin Mehall bb0d18bc73 Spell Zulip correctly on enterprise form 
(imported from commit a1146320c2992428c51f6ec8d25fc97746e02d27)
 2013-11-14 13:38:58 -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
Tim Abbott 90c011e632 Fix rebase issues in the not_enterprise transition. 
(imported from commit f0a8169825de303c60e5dba5cd95eef96cd7de7e)
 2013-11-13 21:04:43 -05:00
acrefoot 34582d8e0a enterprise: disable feedback button in gear menu 
(imported from commit 78d50979366b20ad4cfe708dd5b360746b09c861)
 2013-11-13 20:40:39 -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
Jeff Arnold 11d05c1689 Our docs should not try to hire our customers' employees 
(imported from commit aae1e6fb236b44eabcf3cf7c4e48534bea6cd731)
 2013-11-13 19:57:50 -05:00
Leo Franchi 372984b56d Serve sso app builds to enterprise users 
(imported from commit a9741833c514c364c5e67fdbb31d191e1ab0f1df)
 2013-11-13 18:11:49 -05:00
Allen Rabinovich ca4e6a0ff8 Updates to stream list 
(imported from commit 426a8035e9661598f9bbfa6ae83883ca3ac6106e)
 2013-11-13 14:59:07 -08:00
Luke Faraone 4b8a770825 Don't prompt for a password if password auth is disabled 
(imported from commit d696c9f6de2008c177fa3282383257de15aaeb29)
 2013-11-13 17:57:33 -05:00
Luke Faraone d19ffd67a7 Don't make enterprise users agree to the ToS 
(imported from commit 2d01de949210a14edb5bef949d59a8495136ecac)
 2013-11-13 17:57:32 -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
Jessica McKellar 76e1c80ac5 Add an enterprise registration page. 
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
 2013-11-13 16:20:42 -05:00
Leo Franchi 6274c33f86 Allow disabling of feedback system in UI 
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
 2013-11-13 11:18:02 -05:00
Jeff Arnold cf33d1c512 /terms-enterprise update: We prefer Massachusetts. 
(imported from commit a3c889293566865b6d06844b84e97d9376596f2b)
 2013-11-13 10:51:51 -05:00
Waseem Daher eaec0e0774 Better, retina-ready phone screenshots for /apps (though still not great). 
(imported from commit 7a4a1fc0a203713eb83f75324f26abf8f890a37b)
 2013-11-12 21:58:32 -05:00
Luke Faraone fafa14db9a Patch out references to zilencer so the app runs without it on ENTERPRISE 
(imported from commit bd4fe1ff47e1b4dc9038f800ee8aa2980bd00fdf)
 2013-11-12 18:43:06 -05:00
Jessica McKellar cf96cc478f freshdesk: use their authentication fields intead of auth in the URL. 
(imported from commit 7413db16cd9c5e76e287c32950ab97e8a4503efa)
 2013-11-12 17:17:16 -05:00
Tim Abbott 5293cdebe8 Rename LOCAL_SERVER to ENTERPRISE. 
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
 2013-11-12 15:57:01 -05:00
Jeff Arnold d877ec0e7f Add enterprise terms 
(imported from commit e8e9600797bea6e5c2f6fcd06dccebe69721034e)
 2013-11-12 10:49:29 -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
Jessica McKellar ab874ddc84 Document our Freshdesk integration. 
(imported from commit 1a098c410ca9c7fcca60f6293f3868e6bbae97f2)
 2013-11-12 10:24:26 -05:00
Steve Howell bd25224948 s/RECENT GROUP PMs/GROUP PMs/ 
(imported from commit 500ef9f360149f5362c278bbfe33c408ff813ba1)
 2013-11-09 10:15:51 -05:00
Leo Franchi d13500ac0d Add a email-only sso login page that redirects to a deployment-specific domai 
(imported from commit 7134ad71f01b3c22c61c6c0e65f7196efaf92237)
 2013-11-08 14:33:12 -05:00
Steve Howell 52ec258122 [staging only] Show Recent Group PMs in right sidebar. 
Show up to 10 of your recent group PM conversations in the right
sidebar.  Clicking on the links narrows to the huddle and opens the
compose box for the huddle.  The green circles have opacity
proportional to the number of users present in the huddle.

This is feature flagged to staging only.

Some of this code was written by Allen before commits were squashed.

Known issue: unread counts disappear on certain refresh events.

(imported from commit 3b44665150ba20594d8b0295cb30df03601c1d52)
 2013-11-07 16:54:13 -05:00
Waseem Daher 50ca7c4731 day2 email: Try to make clear that this is the last one. 
(imported from commit 953d491a7c5b6717178c85aed4a96e08a8e61e61)
 2013-11-07 13:23:41 -05:00
Waseem Daher 9c28bf34e8 Remove full names from our day1 and day2 emails. 
The weird formality of using your complete name I think feels even
spammier than saying nothing.

(imported from commit b2326de91866fa3c13c2023723f64d1beadf435e)
 2013-11-07 13:20:58 -05:00
Waseem Daher 17921a92d3 More fun password-reset page. 
(imported from commit b02e123c86004416b4238790a9146817ee35bdcc)
 2013-11-06 13:22:00 -05:00
Waseem Daher 66a0119929 settings: Make password reset more discoverable. 
You need your password to log into the mobile apps, and it's kind
of hard to find where to reset it if you don't remember it (but
logged in via SSO)

(imported from commit fd902bcd0c21d7cb308535722e6789fb4a6114cd)
 2013-11-06 13:22:00 -05:00
Steve Howell c3d176a480 Move marketing pages to corporate app. 
(imported from commit 70528b544ceb4be12fb02be32889e1b9ca8caeb4)
 2013-11-06 12:07:32 -05:00
Steve Howell 6193f60d45 Move static MIT-related pages to corporate app. 
(imported from commit e2c5f72d3f3e4d8f8fa888326b2ba455beb9156c)
 2013-11-06 12:07:31 -05:00
Steve Howell a827d727cc Create non-localserver "corporate" app with jobs pages. 
The corporate "app" is not a full-fledged Django app, but it has
a urls.py and a templates directory.  This commit creates the app
and moves the jobs pages into it.  Localserver deployments will
not see any of the corporate code.

(imported from commit 35889c3cf92329258c30741fdfa564769a4fac1a)
 2013-11-06 12:07:31 -05:00
Luke Faraone 00e72cd97d Switch url parameter to full_name from service-specific gafyd_name 
(imported from commit 21541da29d2846cfd912d19b73e239e96606f9e5)
 2013-11-05 16:17:06 -05:00