83e2ba1208
Update signup/invite emails to use the support message for enterprise.
...
(imported from commit bdec3cb5f6332fdde704c54dfb02f90492329568)
2013-11-20 11:03:38 -05:00
d78511c933
Convert customer3 page to be about EVENT2.
...
(imported from commit 6ff4dafb84710fe3a4bb927ed3b8bc0f9ad9fb83)
2013-11-19 18:09:52 -05:00
a4f3577832
Clean up the appearance of different narrow alert
...
(imported from commit 24882274b2e0e1b28734d594acfe5ca3cd3eb953)
2013-11-19 12:51:32 -08:00
d1619b3f3c
Use a more accurate "is admin?" check.
...
UserProfile.show_admin was intended to be a check for users that have
administrative rights in other realms, which we've harmlessly but
erroneously been using to check if they are an admin in their realm.
Use the more straightforward check instead, with a more intuitive
name.
(imported from commit d81050c7dbbb19e59c5e31750be303a4630e1456)
2013-11-19 14:31:02 -05:00
0355f444af
Document our Asana integration.
...
(imported from commit 1ffa39325331631423cc99ed0fbb09d4e509eec7)
2013-11-19 13:30:35 -05:00
9ca8288918
Do not use display: none on file inputs, as some browsers will not let you trigger clicks on them
...
(imported from commit f05b18f7ad3f4235d33a1142db7e662f97eff308)
2013-11-19 12:35:11 -05:00
1c91d1a5bc
Clean up back end HTML templates.
...
The check-handlebars-templates script now looks at most of our
back end templates to try and find imbalanced tags. This commit
fixes a bunch of the existing templates.
(imported from commit fad4a5d85d68160370dd588b41d6f125f64d198f)
2013-11-19 10:43:56 -05:00
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
dd53b92efc
Add row_class support to /activity tables.
...
(imported from commit 69dcbeccc3b048053b2dcca82c628b0cfccddfbb)
2013-11-18 12:36:24 -05:00
818ef42d05
Show zulip-desktop-sso package for local server installs
...
(imported from commit d0a05bfb2e7a15c02c0e61d6b95ef841a44340b3)
2013-11-18 12:04:43 -05:00
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
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
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
6b0584742f
Remove stray <hr> in password reset form.
...
(imported from commit 3d233bfaba94514411ace4f638fb34e2b35aae30)
2013-11-16 12:39:26 -06:00
9e8346f6d7
Display owners for bots on the admin page.
...
(imported from commit d1a80ab8f784ab7e7249cc020b1980bd45434abd)
2013-11-16 11:35:26 -05:00
b55e406f93
Display deactivated users at the bottom of the admin users page.
...
(imported from commit 1a5d5d64fffc9ed7633d468b975dd56c28f85ccf)
2013-11-16 11:35:26 -05:00
c1ddc0908f
Admin: Put bots in a separate table.
...
(imported from commit 21330e28b486e10aff6af5f48280ea675cbd5697)
2013-11-16 11:35:26 -05:00
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
bafb6f8dc3
fixup day1/day2 email templates
...
(imported from commit 30846fc298d04ac763025e82a60731d158840462)
2013-11-15 21:51:37 -05:00
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
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
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
53c76aa657
Move enterprise-registration to zilencer/ from zerver/
...
(imported from commit d8a58913040376dbdbc9dcee13ab8a7910733da7)
2013-11-15 11:21:52 -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
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
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
90c011e632
Fix rebase issues in the not_enterprise transition.
...
(imported from commit f0a8169825de303c60e5dba5cd95eef96cd7de7e)
2013-11-13 21:04:43 -05:00
34582d8e0a
enterprise: disable feedback button in gear menu
...
(imported from commit 78d50979366b20ad4cfe708dd5b360746b09c861)
2013-11-13 20:40:39 -05:00
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
11d05c1689
Our docs should not try to hire our customers' employees
...
(imported from commit aae1e6fb236b44eabcf3cf7c4e48534bea6cd731)
2013-11-13 19:57:50 -05:00
372984b56d
Serve sso app builds to enterprise users
...
(imported from commit a9741833c514c364c5e67fdbb31d191e1ab0f1df)
2013-11-13 18:11:49 -05:00
ca4e6a0ff8
Updates to stream list
...
(imported from commit 426a8035e9661598f9bbfa6ae83883ca3ac6106e)
2013-11-13 14:59:07 -08:00
4b8a770825
Don't prompt for a password if password auth is disabled
...
(imported from commit d696c9f6de2008c177fa3282383257de15aaeb29)
2013-11-13 17:57:33 -05:00
d19ffd67a7
Don't make enterprise users agree to the ToS
...
(imported from commit 2d01de949210a14edb5bef949d59a8495136ecac)
2013-11-13 17:57:32 -05:00
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
76e1c80ac5
Add an enterprise registration page.
...
(imported from commit 5888f588ad219ba25b235477a7137853e5954bb5)
2013-11-13 16:20:42 -05:00
6274c33f86
Allow disabling of feedback system in UI
...
(imported from commit ce16b2916784e9cf10a230cb47515ffc65888778)
2013-11-13 11:18:02 -05:00
cf33d1c512
/terms-enterprise update: We prefer Massachusetts.
...
(imported from commit a3c889293566865b6d06844b84e97d9376596f2b)
2013-11-13 10:51:51 -05:00
eaec0e0774
Better, retina-ready phone screenshots for /apps (though still not great).
...
(imported from commit 7a4a1fc0a203713eb83f75324f26abf8f890a37b)
2013-11-12 21:58:32 -05:00
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
cf96cc478f
freshdesk: use their authentication fields intead of auth in the URL.
...
(imported from commit 7413db16cd9c5e76e287c32950ab97e8a4503efa)
2013-11-12 17:17:16 -05:00
5293cdebe8
Rename LOCAL_SERVER to ENTERPRISE.
...
(imported from commit 7edf353eefe6c9e7aac74b7bbc37b923cac1b913)
2013-11-12 15:57:01 -05:00
d877ec0e7f
Add enterprise terms
...
(imported from commit e8e9600797bea6e5c2f6fcd06dccebe69721034e)
2013-11-12 10:49:29 -05:00
4a6b7cb20b
Disable password change when SSO is the only login option
...
(imported from commit fd1a14237e2d6ea574331ed178bfc0db5beb18c6)
2013-11-12 10:37:33 -05:00
ab874ddc84
Document our Freshdesk integration.
...
(imported from commit 1a098c410ca9c7fcca60f6293f3868e6bbae97f2)
2013-11-12 10:24:26 -05:00
bd25224948
s/RECENT GROUP PMs/GROUP PMs/
...
(imported from commit 500ef9f360149f5362c278bbfe33c408ff813ba1)
2013-11-09 10:15:51 -05:00
Tim Abbott
Waseem Daher
Allen Rabinovich
Jessica McKellar
Leo Franchi
Steve Howell
acrefoot
Jeff Arnold
Kevin Mehall
Luke Faraone