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

help: Rename and redirect move-content-to-another-stream for channel.

This commit is contained in:
Lauryn Menard 2024-05-01 19:30:20 +02:00 committed by Tim Abbott
parent 4f97c7b202
commit 93dd1e9b25
20 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
help/configure-automated-notices.md
View File

@ -48,7 +48,7 @@ unresolved](/help/resolve-a-topic). These notices will be marked as unread only
for users who had participated in the topic.
Additionally, when moving messages to another
[stream](/help/move-content-to-another-stream) or
[channel](/help/move-content-to-another-channel) or
[topic](/help/move-content-to-another-topic), users can decide whether to send
automated notices to help others understand how content was moved.

2
help/include/sidebar_index.md
View File

@ -137,7 +137,7 @@
* [Rename a topic](/help/rename-a-topic)
* [Resolve a topic](/help/resolve-a-topic)
* [Move content to another topic](/help/move-content-to-another-topic)
* [Move content to another stream](/help/move-content-to-another-stream)
* [Move content to another channel](/help/move-content-to-another-channel)
* [Delete a topic](/help/delete-a-topic)
* [Manage inactive streams](/help/manage-inactive-streams)

2
help/link-to-a-message-or-conversation.md
View File

@ -46,7 +46,7 @@ Viewing a topic via a message link will never mark messages as read.
These links will still work even when the message is
[moved to another topic](/help/move-content-to-another-topic)
or [stream](/help/move-content-to-another-stream) or
or [channel](/help/move-content-to-another-channel) or
if its [topic is resolved](/help/resolve-a-topic).
Zulip uses the same permanent link syntax when [quoting a

48
help/move-content-to-another-stream.md → help/move-content-to-another-channel.md
View File

@ -1,9 +1,9 @@
# Move content to another stream
# Move content to another channel
Zulip makes it possible to move messages, or an entire topic, to another stream.
Zulip makes it possible to move messages, or an entire topic, to another channel.
Organizations can [configure][configure-moving-permissions] which
[roles](/help/roles-and-permissions) have permission to move messages between
streams.
channels.
[configure-moving-permissions]: /help/restrict-moving-messages#configure-who-can-move-messages-to-another-stream
@ -15,10 +15,10 @@ destination topic, or both. These notices include:
* How many messages were moved, or whether the whole topic was moved.
* Who moved the content.
## Move a topic to another stream
## Move a topic to another channel
To move a topic, you must have access to both the source and
destination streams.
destination channels.
{start_tabs}
@ -27,24 +27,24 @@ destination streams.
1. Select **Move topic**. If you do not see this option, you do not have permission
to move this topic.
1. Select the destination stream for the topic from the streams dropdown list.
1. Select the destination channel for the topic from the channels dropdown list.
1. _(optional)_ Change the topic name.
1. Toggle whether automated notices should be sent.
1. Click **Confirm** to move the topic to another stream.
1. Click **Confirm** to move the topic to another channel.
!!! warn ""
**Note**: When a topic is moved to a private stream with protected history,
**Note**: When a topic is moved to a private channel with protected history,
messages in the topic will be visible to all the subscribers.
{end_tabs}
## Move messages to another stream
## Move messages to another channel
{start_tabs}
@ -53,9 +53,9 @@ destination streams.
1. Select **Move messages**. If you do not see this option, you do not have permission
to move this message.
1. Select the destination stream from the streams dropdown list. If
the stream input is disabled, you do not have permission to move
this message to a different stream.
1. Select the destination channel from the channels dropdown list. If
the channel input is disabled, you do not have permission to move
this message to a different channel.
1. _(optional)_ Change the topic name.
@ -63,30 +63,30 @@ destination streams.
1. Toggle whether automated notices should be sent.
1. Click **Confirm** to move the selected content to another stream.
1. Click **Confirm** to move the selected content to another channel.
!!! warn ""
**Note**: You cannot edit content of a message while changing its stream.
**Note**: You cannot edit content of a message while changing its channel.
{end_tabs}
## Moving content to private streams
## Moving content to private channels
Access to messages moved to another stream will immediately be controlled by the
access policies for the destination stream. Content moved to a private stream will
thus appear to be deleted to users who are not subscribers of the destination stream.
Access to messages moved to another channel will immediately be controlled by the
access policies for the destination channel. Content moved to a private channel will
thus appear to be deleted to users who are not subscribers of the destination channel.
Content moved to a [private stream with protected history](/help/stream-permissions)
Content moved to a [private channel with protected history](/help/stream-permissions)
will only be accessible to users who both:
* Were subscribed to the *original* stream when the content was *sent*.
* Are subscribed to the *destination* stream when the content is *moved*.
* Were subscribed to the *original* channel when the content was *sent*.
* Are subscribed to the *destination* channel when the content is *moved*.
## Moving content out of private streams
## Moving content out of private channels
In [private streams with protected history](/help/stream-permissions),
In [private channels with protected history](/help/stream-permissions),
Zulip determines whether to treat the entire topic as moved using the
access permissions of the user requesting the topic move. This means
that the automated notices sent by the notification bot will report
@ -95,7 +95,7 @@ message in the topic that they can access, regardless of whether older
messages exist that they cannot access.
Similarly, [muted topics](/help/mute-a-topic) will be migrated to the
new stream and topic if the requesting user moved every message in the
new channel and topic if the requesting user moved every message in the
topic that they can access.
This model ensures that the topic editing feature cannot be abused to

2
help/move-content-to-another-topic.md
View File

@ -36,5 +36,5 @@ Organizations can [configure](/help/restrict-moving-messages) which
## Related articles
* [Rename a topic](/help/rename-a-topic)
* [Move content to another stream](/help/move-content-to-another-stream)
* [Move content to another channel](/help/move-content-to-another-channel)
* [Restrict moving messages](/help/restrict-moving-messages)

2
help/rename-a-topic.md
View File

@ -52,6 +52,6 @@ Organizations can [configure](/help/restrict-moving-messages) which
## Related articles
* [Move content to another topic](/help/move-content-to-another-topic)
* [Move content to another stream](/help/move-content-to-another-stream)
* [Move content to another channel](/help/move-content-to-another-channel)
* [Resolve a topic](/help/resolve-a-topic)
* [Restrict moving messages](/help/restrict-moving-messages)

2
help/restrict-moving-messages.md
View File

@ -82,7 +82,7 @@ Permissions for moving messages between streams can be configured separately.
* [Rename a topic](/help/rename-a-topic)
* [Resolve a topic](/help/resolve-a-topic)
* [Move content to another topic](/help/move-content-to-another-topic)
* [Move content to another stream](/help/move-content-to-another-stream)
* [Move content to another channel](/help/move-content-to-another-channel)
* [Restrict message editing and
deletion](/help/restrict-message-editing-and-deletion)
* [Roles and permissions](/help/roles-and-permissions)

2
help/view-a-messages-edit-history.md
View File

@ -5,7 +5,7 @@ administrators can [disable message edit
history](/help/disable-message-edit-history).
Messages with any content edits are labeled **EDITED**, while messages that have
only been [moved to a new stream](/help/move-content-to-another-stream) or
only been [moved to a new channel](/help/move-content-to-another-channel) or
[topic](/help/move-content-to-another-topic) are labeled **MOVED**. In
organizations where message edit history is
[disabled](/help/disable-message-edit-history), moved messages are simply marked

2
templates/corporate/case-studies/asciidoctor-case-study.md
View File

@ -91,7 +91,7 @@ tools](/help/moderating-open-organizations) make it easy to fix. Community
moderators can keep the dialogue organized by reclassifying topics and posts
without disrupting the ongoing conversation. “If someone accidentally posts to
the wrong stream or topic, Zulip allows me to [move those messages
around](/help/move-content-to-another-stream) so they land in the right spot,”
around](/help/move-content-to-another-channel) so they land in the right spot,”
Dan says. “Moving messages also sends a subtle hint to the person posting about
where to post the next time. And I can use [topic
references](/help/link-to-a-message-or-conversation#link-to-a-stream-or-topic-within-zulip)

2
templates/corporate/comparison_table_integrated.html
View File

@ -333,7 +333,7 @@
<tr>
<td class="comparison-table-feature">
Move messages between
<a href="/help/move-content-to-another-stream">streams</a> and
<a href="/help/move-content-to-another-channel">channels</a> and
<a href="/help/move-content-to-another-topic">topics</a>
</td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>

2
templates/corporate/development-community.md
View File

@ -86,7 +86,7 @@ off the discussion by [starting a new topic](/help/starting-a-new-topic)
in the appropriate stream! Don’t stress too much about picking the
right place if you’re not sure; anyone in the community can edit a
topic name, and [moderators](/help/roles-and-permissions) can [move a
topic to a different stream](/help/move-content-to-another-stream).
topic to a different stream](/help/move-content-to-another-channel).
## Streams for everyone

2
templates/corporate/for/business.html
View File

@ -334,7 +334,7 @@
can <a href="/help/edit-a-message">edit your
message</a>, or move it to a
different <a href="/help/move-content-to-another-topic">topic</a>
or <a href="/help/move-content-to-another-stream">stream</a>.
or <a href="/help/move-content-to-another-channel">stream</a>.
</div>
</li>
</ul>

2
templates/corporate/for/events.html
View File

@ -203,7 +203,7 @@
<li><div class="list-content"><a href="/help/format-your-message-using-markdown#latex">Type LaTeX</a> directly into your Zulip message, and see it beautifully rendered.</div></li>
<li><div class="list-content"><a href="/help/code-blocks">Zulip code blocks</a> come with syntax highlighting for over 250 languages, and integrated <a href="/help/code-blocks#code-playgrounds">code playgrounds.</a></div></li>
<li><div class="list-content">Structure your ideas with bulleted and numbered <a href="/help/format-your-message-using-markdown#lists">lists</a>.</div></li>
<li><div class="list-content">If you made a mistake, no worries! You can <a href="/help/edit-a-message">edit your message</a>, or move it to a different <a href="/help/move-content-to-another-topic">topic</a> or <a href="/help/move-content-to-another-stream">stream</a>.</div></li>
<li><div class="list-content">If you made a mistake, no worries! You can <a href="/help/edit-a-message">edit your message</a>, or move it to a different <a href="/help/move-content-to-another-topic">topic</a> or <a href="/help/move-content-to-another-channel">stream</a>.</div></li>
</ul>
</div>
</div>

2
templates/corporate/for/open-source.html
View File

@ -367,7 +367,7 @@
can <a href="/help/edit-a-message">edit your
message</a>, or move it to a
different <a href="/help/move-content-to-another-topic">topic</a>
or <a href="/help/move-content-to-another-stream">stream</a>.
or <a href="/help/move-content-to-another-channel">stream</a>.
</div>
</li>
</ul>

2
templates/corporate/for/research.html
View File

@ -207,7 +207,7 @@
can <a href="/help/edit-a-message">edit your
message</a>, or move it to a
different <a href="/help/move-content-to-another-topic">topic</a>
or <a href="/help/move-content-to-another-stream">stream</a>.
or <a href="/help/move-content-to-another-channel">stream</a>.
</div>
</li>
</ul>

2
templates/corporate/why-zulip.md
View File

@ -162,7 +162,7 @@ With conversations organized by topic, you can review prior discussions to
understand past work, explanations, and decisions — your chat history becomes a
knowledge base. If a conversation shifts to a new topic, it’s easy to reorganize
by moving messages to a different [topic](/help/move-content-to-another-topic)
or [stream](/help/move-content-to-another-stream). There is no more rifling
or [stream](/help/move-content-to-another-channel). There is no more rifling
through unrelated chatter to find the context you need. You can even [link to a
Zulip
conversation](/help/link-to-a-message-or-conversation#link-to-zulip-from-anywhere)

2
zerver/lib/email_notifications.py
View File

@ -858,7 +858,7 @@ def enqueue_welcome_emails(user: UserProfile, realm_creation: bool = False) -> N
unsubscribe_link=unsubscribe_link,
move_messages_link=realm_url + "/help/move-content-to-another-topic",
rename_topics_link=realm_url + "/help/rename-a-topic",
move_channels_link=realm_url + "/help/move-content-to-another-stream",
move_channels_link=realm_url + "/help/move-content-to-another-channel",
)
send_future_email(

1
zerver/lib/url_redirects.py
View File

@ -96,6 +96,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
),
URLRedirect("/help/pin-a-stream", "/help/pin-a-channel"),
URLRedirect("/help/change-the-color-of-a-stream", "/help/change-the-color-of-a-channel"),
URLRedirect("/help/move-content-to-another-stream", "/help/move-content-to-another-channel"),
]
LANDING_PAGE_REDIRECTS = [

2
zerver/lib/zulip_update_announcements.py
View File

@ -133,7 +133,7 @@ configuration change), or [turn this feature off]({organization_settings_url}) a
zulip_update_announcements_stream=realm.zulip_update_announcements_stream.name,
topic_name=topic_name,
organization_settings_url="/#organization/organization-settings",
move_content_another_stream_help_url="/help/move-content-to-another-stream",
move_content_another_stream_help_url="/help/move-content-to-another-channel",
)
return internal_prep_huddle_message(
realm, sender, remove_single_newlines(content), recipient_users=administrators

2
zerver/openapi/zulip.yaml
View File

@ -2067,7 +2067,7 @@ paths:
for direct messages contained additional `sender_id` and
`recipient_id` fields.
[message-move-stream]: /help/move-content-to-another-stream
[message-move-stream]: /help/move-content-to-another-channel
[stream-access]: /help/stream-permissions
properties:
id: