Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update signing in page.

This commit is contained in:
Alya Abbott 2016-12-30 16:16:15 -08:00 committed by Tim Abbott
parent 6bedbbb399
commit 8852db34c6
2 changed files with 22 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
static/images/help/zulip-login.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 52 KiB

68
templates/zerver/help/signing-in.md
View File

@ -1,84 +1,60 @@
# Signing in
![Zulip login page](/static/images/help/zulip-login.png)
Zulip offers realm administrators the option of enabling multiple methods for users to sign in to their Zulip organization. If your realm administrators have enabled Google or GitHub authentication, you can use the credentials to your Google or GitHub account as an alternative to using your account's email address and password to sign in.
Zulip offers three ways to sign in: e-mail and password, Google
credentials, and GitHub credentials. Your organization's administrator
may choose to enable or disable any of these options. So don't worry
if your login page doesn't have some of the options described here!
## Signing in with your email address
![Zulip sign in email](/static/images/help/signin-email.png)
You can sign in to your Zulip organization using your email address by following a few simple steps.
You can sign into your Zulip organization using your email address by following a few simple steps.
1. In the field labeled **Email**, enter the email address that you signed up to Zulip with. Please note that the **Email** field is case-sensitive.
1. In the field labeled **Email**, enter the email address that you used to sign up for Zulip. Please note that the **Email** field is case-sensitive.
If you've forgotten which email you signed up to Zulip with, try checking your email accounts for the "Welcome to Zulip" that was sent to you upon the registration of your account.
!!! tip ""
If you've forgotten which email you used to sign up for Zulip, you can try searching your email accounts for the e-mail you received when you first signed up. The subject line is "Welcome to Zulip".
2. In the field labeled **Password**, enter your password. Please note that the **Password** field is case-sensitive.
If you've forgotten your password, see the [Forgot password](#forgot-password) section for instructions on how to reset your password.
3. Once you have finished entering your credentials, click the blue **Log in** button to finish signing in.
### Forgot password
If you've forgotten your password, click the **Forgot password?** link below the **Password** field.
![Zulip sign in reset password](/static/images/help/reset-password.png)
After you enter your email address in the **Email** field and click the blue **Reset password** button, you will receive an email similar to the example below.
```
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Subject: Zulip password reset
From: Zulip <zulip@example.com>
To: [your email address]
Date: [timestamp]
Psst. Word on the street is that you forgot your password, [your email address].
It's all good. Follow the link below and we'll take care of the rest:
[password reset link]
Thanks,
Your friends at Zulip HQ
```
!!! tip ""
If you've forgotten your password, see the [Change your password](/help/change-your-password) page for instructions on how to reset it.
## Signing in with your Google account
![Zulip sign in Google](/static/images/help/signin-google.png)
If your organization has enabled Google authentication, you can sign into Zulip using your Google account by following a few simple steps.
If your organization has enabled Google authentication, you can sign in to your Zulip organization using your Google account by following a few simple steps.
1. Click the **Sign in with Google** button located under the **Login** button and **Forgot your password?** link.
1. Click the blue **Sign in with Google** button located under the **Login** button and **Forgot your password?** link.
![Zulip sign in Google](/static/images/help/signin-google.png)
2. If you are not signed in to a Google account, Google will ask you to enter the credentials to your Google account.
2. If you are not signed into a Google account, Google will ask you to enter the credentials to your Google account.
![Zulip sign in Google login](/static/images/help/google-login.png)
3. If you're signing in to Zulip with a Google account for the first time, you will be taken to a page titled **Request for permission**.
3. If you're signing into Zulip with a Google account for the first time, you will be taken to a page titled **Request for permission**.
![Zulip sign in Google Request Permission](/static/images/help/google-request.png)
Zulip requires knowledge of your email address and basic profile info, such as your name, for login purposes.
4. Click the blue **Allow** button to finish your Google login.
4. Click the **Allow** button to finish your Google login.
If you click the **Deny** button, Zulip cannot finish logging you in, and you will be redirected to the Zulip login page.
## Signing in with your GitHub account
![Zulip sign in GitHub](/static/images/help/signin-github.png)
If your organization has enabled GitHub authentication, you can sign into
Zulip using your GitHub account by following a few simple steps.
If your organization has enabled GitHub authentication, you can sign in to your Zulip organization using your GitHub account by following a few simple steps.
1. Click the **Sign in with GitHub** button located under the **Sign in with Google** button.
1. Click the white **Sign in with GitHub** button located under the **Sign in with Google** button.
![Zulip sign in GitHub](/static/images/help/signin-github.png)
2. If you are not signed in to a GitHub account, GitHub will ask you to enter your credentials to your GitHub account.
2. If you are not signed into a GitHub account, GitHub will ask you to enter the credentials for your GitHub account.
![Zulip sign in GitHub login](/static/images/help/github-login.png)
3. If you're signing in to Zulip with a GitHub account for the first time, you will be taken to a page titled **Authorize application**.
3. If you're signing into Zulip with a GitHub account for the first time, you will be taken to a page titled **Authorize application**.
![Zulip sign in GitHub Request Permission](/static/images/help/github-request.png)