diff --git a/static/templates/alert_word_settings_item.handlebars b/static/templates/alert_word_settings_item.handlebars index 8c0afffa86..c7e5b3ac14 100644 --- a/static/templates/alert_word_settings_item.handlebars +++ b/static/templates/alert_word_settings_item.handlebars @@ -1,7 +1,7 @@ {{! Alert word in the settings page that can be removed }}
404: Page not found.
+
404: Page not found.
We know this is stressful, but we still love you.
diff --git a/templates/500.html b/templates/500.html index aa1cef00ed..9366b0d434 100644 --- a/templates/500.html +++ b/templates/500.html @@ -10,7 +10,7 @@ {% block portico_content %}500: Internal server error.
+
500: Internal server error.
Well oops. This one's probably our fault. Sorry about that!
diff --git a/templates/confirmation/confirm.html b/templates/confirmation/confirm.html index 8755a0b633..1a54b1a885 100644 --- a/templates/confirmation/confirm.html +++ b/templates/confirmation/confirm.html @@ -8,16 +8,16 @@You're confirmed. We're not exactly sure what we confirmed you for, but whatever it is you're totally good.
{% else %} -Whoops, something's not right. We couldn't find your confirmation ID!
+
Whoops, something's not right. We couldn't find your confirmation ID!
{% if enterprise % } -Make sure you copied the link correctly in to your browser.
+
Make sure you copied the link correctly in to your browser.
If you're still having problems, please contact your Zulip administrator at {{ support_email }}.
{% else % }Make sure you copied the link correctly in to your browser. If you're - still encountering this page, its probably our fault. We're sorry.
+ still encountering this page, its probably our fault. We're sorry.
Anyway, shoot us a line at {{ support_email }} and we'll get diff --git a/templates/corporate/features.html b/templates/corporate/features.html index 3d16c909d2..703240001c 100644 --- a/templates/corporate/features.html +++ b/templates/corporate/features.html @@ -54,7 +54,7 @@
Want someone's attention in a conversation? @-notify them - and they'll be right over. + and they'll be right over.
If you have any questions, please contact us using the "Send feedback" button in Zulip or e-mail us - at support@zulip.com
+ at support@zulip.com
-I work at of us, and today we use to chat.
+ name="product" placeholder="IRC" /> to chat.I'm looking forward to it!
diff --git a/templates/corporate/zephyr-mirror.html b/templates/corporate/zephyr-mirror.html index 965ae031f0..8e0181806f 100644 --- a/templates/corporate/zephyr-mirror.html +++ b/templates/corporate/zephyr-mirror.html @@ -71,7 +71,4 @@ mirror script instead of using Webathena. doing so will result in messages you sent being forwarded to Zephyr twice. -If you have any questions, please contact us using the "Send feedback" button in Zulip or e-mail us at -support@zulip.com
We couldn't validate your Google account
+
We couldn't validate your Google account
You might want to try logging in via Google again or log in with a username or password.
diff --git a/templates/zerver/accounts_accept_terms.html b/templates/zerver/accounts_accept_terms.html index 685d9d1074..33cb714697 100644 --- a/templates/zerver/accounts_accept_terms.html +++ b/templates/zerver/accounts_accept_terms.html @@ -20,7 +20,7 @@ Allow the user to accept the terms, creating an email record of that fact.{{ email }}
+
{{ email }}
Check your email so we can get started.
+
Check your email so we can get started.
Still no email? We can resend it.
(Just in case, take a look at your Spam folder.)
Note: The latest versions of the Mac app require Mac OS X 10.7+. If you are running OS X 10.6 (Snow Leopard), please - download this version instead.
+ download this version instead.{% if not_enterprise %} @@ -89,10 +89,11 @@ sudo apt-get install zulip-desktop-sso
We provide a binary tarball of the Zulip application, built for 64-bit systems. +
{% else %}We provide a binary tarball of the Zulip application, built for 64-bit systems. +
{% endif %} -You will need your Basecamp account ID. You can find it as a sequence of numbers in the URL when you log in:
Edit the Basecamp and Zulip credentials in integrations/basecamp/zulip_basecamp_config.py
using
- your favorite editor:
+ your favorite editor:
Congratulations! You're done!
Whenever you create a new project,
calendar event, comment, message, or more, you'll get a notification in your selected stream
- with the project or calendar as the topic.
+ with the project or calendar as the topic.
commits
with a subject that matches the re
jenkins
) already exist? If not, add yourself to it and try again.commits
with a subject that matches the re
In the Administrators page, navigate to Plugins > Other > Script Listeners
. In the Add Listener
section, click on
the Custom Listener
option. Select the events you wish the Zulip integration to fire for, and the projects you wish Zulip to be notified for.
In the Name of groovy class
field, enter org.zulip.jira.ZulipListener
.
+
Click Add Listener
, and JIRA will now notify your Zulip of changes to your issues!
/etc/nagios3/conf.d/contacts.cfg
, doing
something like:
+
define contactgroup{ contactgroup_name admins @@ -958,6 +961,7 @@ key=NAGIOS_BOT_API_KEY https://github.com/zulip/phabricator-to-zulip to get it set up. +
With domain administrators +
With domain administrators
If your Zulip Account is managed for you by a domain administrator then your domain administrator and resellers who provide user support to your diff --git a/templates/zerver/register.html b/templates/zerver/register.html index 380c00307c..d31c0a37ad 100644 --- a/templates/zerver/register.html +++ b/templates/zerver/register.html @@ -33,7 +33,7 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
{{ email }}
+
{{ email }}