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

Merge branch 'zulip:main' into issue-29472

This commit is contained in:
arshn77 2024-04-23 18:01:31 -04:00 committed by GitHub
parent b31adec7ac 7aa90440ed
commit 1e6b62af30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
11 changed files with 89 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api_docs/deploying-bots.md
View File

@ -89,7 +89,7 @@ pip3 install zulip_botserver
1. Register new bot users on the Zulip server's web interface.
* Log in to the Zulip server.
* Navigate to *Personal settings (<i class="fa fa-cog"></i>)* -> *Bots* -> *Add a new bot*.
* Navigate to *Personal settings (<i class="zulip-icon zulip-icon-gear"></i>)* -> *Bots* -> *Add a new bot*.
Select *Outgoing webhook* for bot type, fill out the form (using
the URL from above) and click on *Create bot*.
* A new bot user should appear in the *Active bots* panel.

2
api_docs/outgoing-webhooks.md
View File

@ -18,7 +18,7 @@ with porting an existing Slack integration to work with Zulip.
To register an outgoing webhook:
* Log in to the Zulip server.
* Navigate to *Personal settings (<i class="fa fa-cog"></i>)* -> *Bots* ->
* Navigate to *Personal settings (<i class="zulip-icon zulip-icon-gear"></i>)* -> *Bots* ->
*Add a new bot*. Select *Outgoing webhook* for bot type, the URL
you'd like Zulip to post to as the **Endpoint URL**, the format you
want, and click on *Create bot*. to submit the form/

4
help/delete-a-message.md
View File

@ -24,8 +24,8 @@ your message.
{!message-actions.md!}
1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon. If you do not see
the **pencil** (<i class="fa fa-pencil"></i>) icon, you do not have
1. Click the **pencil** (<i class="zulip-icon zulip-icon-edit"></i>) icon. If you do not see
the **pencil** (<i class="zulip-icon zulip-icon-edit"></i>) icon, you do not have
permission to delete the content of this message.
1. Delete the content of the message.

4
help/edit-a-message.md
View File

@ -18,8 +18,8 @@ edit the content of a message sent by another user.
{!message-actions.md!}
1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon. If you do not see
the **pencil** (<i class="fa fa-pencil"></i>) icon, you do not have
1. Click the **pencil** (<i class="zulip-icon zulip-icon-edit"></i>) icon. If you do not see
the **pencil** (<i class="zulip-icon zulip-icon-edit"></i>) icon, you do not have
permission to edit this message.
1. Edit the content of the message.

4
help/include/invite-users.md
View File

@ -1,4 +1,4 @@
1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper
right corner of the web or desktop app.
1. Select <i class="fa fa-user-plus"></i> **Invite users**.
1. Select <i class="zulip-icon zulip-icon-user-plus"></i> **Invite users**.

2
help/logging-in.md
View File

@ -56,7 +56,7 @@ Here are some ways to find the URL for your Zulip organization.
* On [Zulip Cloud](https://zulip.com/plans/) and other Zulip servers updated to
[Zulip 6.0 or
higher](https://zulip.readthedocs.io/en/stable/overview/changelog.html#zulip-6-x-series),
click the **gear** (<i class="fa fa-cog"></i>) icon in the upper right
click the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper right
corner of the web or desktop app. Your organization's log in URL is shown in the top
section of the menu.

2
help/logging-out.md
View File

@ -3,7 +3,7 @@
{start_tabs}
{tab|desktop-web}
1. Click the **gear** (<i class="fa fa-cog"></i>) icon in the top
1. Click the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the top
right corner of the app.
1. Click **Log out**.

95
help/view-and-edit-your-message-drafts.md
View File

@ -1,8 +1,9 @@
# Draft messages
Zulip automatically saves the content of your message as a draft when you
close the compose box, ensuring that you never lose your work. Drafts are
saved for 30 days.
Zulip automatically saves the content of your message as a draft when you close
the compose box, ensuring that you never lose your work. When you start
composing, the most recently edited draft for the conversation you are composing
to automatically appears in the compose box. Drafts are saved for 30 days.
!!! warn ""
@ -11,6 +12,8 @@ saved for 30 days.
## Save a draft
### Save a draft and stop composing
{start_tabs}
{tab|desktop-web}
@ -31,23 +34,56 @@ saved for 30 days.
{end_tabs}
## Edit a draft
### Save a draft and start a new message
{start_tabs}
{tab|desktop-web}
{!start-composing.md!}
1. Click on the **ellipsis** (<i class="zulip-icon zulip-icon-more-vertical"></i>)
in the bottom right corner of the compose box, next to the **Send**
(<i class="zulip-icon zulip-icon-send"></i>) button.
1. Select **Save draft and start a new message**.
{end_tabs}
## Restore a draft
To make it easier to find the draft you are looking for, drafts for the
conversation you are composing to are shown at the top of the drafts list in the
web and desktop apps. If you have saved drafts for the current conversation, the
counter next to the **Drafts** button in the compose box shows how many there are.
{start_tabs}
{tab|via-left-sidebar}
{!go-to-draft-messages.md!}
1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon on the draft you
want to edit.
1. Edit the message.
want to restore.
!!! keyboard_tip ""
You can also use <kbd>Enter</kbd> within the drafts view to restore the
selected draft.
You can also use <kbd>D</kbd> to bring up your list of saved drafts, and
<kbd>Enter</kbd> within the drafts view to restore the selected draft.
{tab|via-compose-box-buttons}
{!start-composing.md!}
1. Click the **Drafts** button on the right side of the compose box.
1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon on the draft you
want to restore.
!!! keyboard_tip ""
You can also use <kbd>D</kbd> to bring up your list of saved drafts, and
<kbd>Enter</kbd> within the drafts view to restore the selected draft.
{end_tabs}
@ -57,7 +93,7 @@ saved for 30 days.
{start_tabs}
{tab|desktop-web}
{tab|via-left-sidebar}
{!go-to-draft-messages.md!}
@ -66,8 +102,22 @@ saved for 30 days.
!!! keyboard_tip ""
You can also use <kbd>Backspace</kbd> within the drafts view to delete the
selected draft.
You can also use <kbd>D</kbd> to bring up your list of saved drafts, and
<kbd>Backspace</kbd> within the drafts view to delete the selected draft.
{tab|via-compose-box-buttons}
{!start-composing.md!}
1. Click the **Drafts** button on the right side of the compose box.
1. Click the **trash** (<i class="fa fa-trash-o"></i>) icon on the draft you
want to delete.
!!! keyboard_tip ""
You can also use <kbd>D</kbd> to bring up your list of saved drafts, and
<kbd>Backspace</kbd> within the drafts view to delete the selected draft.
{end_tabs}
@ -75,7 +125,7 @@ saved for 30 days.
{start_tabs}
{tab|desktop-web}
{tab|via-left-sidebar}
{!go-to-draft-messages.md!}
@ -86,19 +136,26 @@ saved for 30 days.
1. Click the **trash** (<i class="fa fa-trash-o"></i>) icon in the
upper right corner of the drafts view to delete all selected drafts.
{end_tabs}
!!! keyboard_tip ""
## View your drafts
You can also use <kbd>D</kbd> to bring up your list of saved drafts.
{start_tabs}
{tab|via-compose-box-buttons}
{tab|desktop-web}
{!start-composing.md!}
{!go-to-draft-messages.md!}
1. Click the **Drafts** button on the right side of the compose box.
1. Click **Select all drafts** in the upper right corner of
the drafts view, or select the drafts you want to delete
by toggling the checkboxes on the right.
1. Click the **trash** (<i class="fa fa-trash-o"></i>) icon in the
upper right corner of the drafts view to delete all selected drafts.
!!! keyboard_tip ""
Use <kbd>D</kbd> to bring up your list of saved drafts.
You can also use <kbd>D</kbd> to bring up your list of saved drafts.
{end_tabs}

2
help/view-zulip-version.md
View File

@ -19,7 +19,7 @@ Zulip Cloud organizations are always updated to the latest version of Zulip.
{tab|v6}
1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper
right corner of the web or desktop app.
1. View the version number or Zulip Cloud plan in the top section of the menu.

2
zerver/lib/markdown/help_settings_links.py
View File

@ -102,7 +102,7 @@ link_mapping = {
}
settings_markdown = """
1. Click on the **gear** (<i class="fa fa-cog"></i>) icon in the upper
1. Click on the **gear** (<i class="zulip-icon zulip-icon-gear"></i>) icon in the upper
right corner of the web or desktop app.
1. Select **{setting_type_name}**.

2
zerver/lib/markdown/tabbed_sections.py
View File

@ -108,7 +108,7 @@ TAB_SECTION_LABELS = {
"via-paste": "Via paste",
"via-drag-and-drop": "Via drag-and-drop",
"via-markdown": "Via Markdown",
"via-compose-box-buttons": "Via compose box buttons",
"via-compose-box-buttons": "Via compose box button",
"stream-compose": "Compose to a stream",
"dm-compose": "Compose a DM",
"v8": "Zulip Server 8.0+",