Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MM-34475 Emoji 13.0 with new library #4700

Merged
merged 10 commits into from
Jul 9, 2021
Merged

MM-34475 Emoji 13.0 with new library #4700

merged 10 commits into from
Jul 9, 2021

Conversation

cwarnermm
Copy link
Member

Documentation for: mattermost/mattermost-webapp#8220

Updated:

  • Messaging > Work with Messages > Using Emojis > Adding Emojis to messages
    • Added details about selecting skin tone when selecting or typing emojis
    • Removed the Accessing Alternate Skin Tones section
    • Corrected RST formatting so that custom emoji sections now display as intended on the same page

cwarnermm added 3 commits July 6, 2021 14:36
@cwarnermm
MM-34475 Emoji 13.0 with new library
d7688e0 
Documentation for: mattermost/mattermost-webapp#8220

Updated:
- Messaging > Work with Messages > Using Emojis > Adding Emojis to messages
   - Added details about selecting skin tone when selecting or typing emojis
   - Removed the Accessing Alternate Skin Tones section
   - Corrected RST formatting so that custom emoji sections now display as intended on the same page
@cwarnermm
removed custom emoji topic from toctree
6f58034
@cwarnermm
Replace 1 screenshot
1de9f6a
@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA d7688e0

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA 6f58034

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA 1de9f6a

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA 71428fe

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA f915d4a

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA e45c36f

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA 2e4a324

@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA 4cbbb88

@cwarnermm cwarnermm added 1: PM Review Requires review by a product manager 2: Editor Review Requires review by an editor labels Jul 6, 2021
@cwarnermm cwarnermm added this to the v5.37.0 milestone Jul 6, 2021
esethna
esethna approved these changes Jul 6, 2021
View reviewed changes
Copy link
Contributor

@esethna esethna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving if screenshot is updated ^

source/help/messaging/emoji.rst

Select the smile icon inside the Mattermost message input box to open the Emoji Picker.
Select the **Smile** icon inside the Mattermost message input box to open the Emoji Picker.

.. image:: ../../images/selectemoji.png
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

emoji picker was redesigned, needs new screenshot

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Updated!

@esethna esethna removed the 1: PM Review Requires review by a product manager label Jul 6, 2021
@github-actions
Copy link

github-actions bot commented Jul 6, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA d2dc7ac

justinegeffen
justinegeffen approved these changes Jul 9, 2021
View reviewed changes
Copy link
Contributor

@justinegeffen justinegeffen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one correction, otherwise LGTM! Approving to expedite the merge.

source/help/messaging/emoji.rst Outdated Show resolved Hide resolved
@cwarnermm @justinegeffen
Update source/help/messaging/emoji.rst
a4898e0 
Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>
@cwarnermm cwarnermm added 3: Reviews Complete All reviewers have approved the pull request and removed 2: Editor Review Requires review by an editor labels Jul 9, 2021
@github-actions
Copy link

github-actions bot commented Jul 9, 2021

Newest code from cwarnermm has been published to preview environment for Git SHA a4898e0

@amyblais amyblais merged commit 9bd72de into v5.37-documentation Jul 9, 2021
@amyblais amyblais deleted the MM-34475-Emoji-13.0-with-new-library branch July 9, 2021 21:06
amyblais added a commit that referenced this pull request Jul 16, 2021
@amyblais @cwarnermm @justinegeffen
V5.37 documentation (#4732)
9669cc8 
* Update conf.py

* 5.37 upgrade notes (#4706)

* Update important-upgrade-notes.rst

* Update important-upgrade-notes.rst

* Update open-source-components.rst

* Update release-lifecycle.rst

* Update upgrade.rst

* Update extended-support-release.rst

* Update version-archive.rst

* Update release-lifecycle.rst

* Update important-upgrade-notes.rst

* Adding English Australian to translated languages (#4699)

* Adding English Australian to translated languages

Documentation for: mattermost/mattermost-webapp#8192

Updated:
- About Mattermost > Product Overview 
   - Updated languages count to 20, including Australian English
- About Mattermost > Product Overview > Mattermost Team Edition 
   - Added Australian English as a supported language

* Added Australian English to supported languages list

* Updated supported languages count

* MM-34475 Emoji 13.0 with new library (#4700)

* MM-34475 Emoji 13.0 with new library

Documentation for: mattermost/mattermost-webapp#8220

Updated:
- Messaging > Work with Messages > Using Emojis > Adding Emojis to messages
   - Added details about selecting skin tone when selecting or typing emojis
   - Removed the Accessing Alternate Skin Tones section
   - Corrected RST formatting so that custom emoji sections now display as intended on the same page

* removed custom emoji topic from toctree

* Replace 1 screenshot

* Reverted screenshot replacement

* Added new screenshot for default skin tone selection

* Added skin tone selection screenshot

* Update source/help/messaging/emoji.rst

* Minor text updates for clarity

* Replaced first image with redesigned Emoji Picker

* Update source/help/messaging/emoji.rst

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* Allow uploading .jpeg files on Linux (#4701)

* Allow uploading .jpeg files on Linux

Documentation for: mattermost/mattermost-webapp#8224

Updated:
- Messaging > Customize Mattermost Messaging > Account Settings > General > Profile Picture
   - Clarified that BMP, JPG, JPEG, and PNG file formats are supported

* Update source/help/settings/account-settings.rst

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* Clarify Add Member to Channel limit (#4704)

Documentation for: mattermost/mattermost-webapp#8077

Updated:
- Messaging > Manage Teams, Channels, and Members > Managing Channels > Adding members to a channel
   - clarified that up to 20 members can be added at a time

* Custom status expiry (#4697)

* Custom status expiry

Documentation for: mattermost/mattermost-webapp#8059

Updated:
- Messaging > Customize Mattermost Messaging > Setting Your Status and Availability > Clearing a Custom Status
   - Added details about setting a custom status expiry

* Added new custom status expiry screenshot

* Applied reviewer feedback

* MM-24335 Show recently viewed channels when channel switcher opens (#4698)

* MM-24335 Show recently viewed channels when channel switcher opens

Documentation for: mattermost/mattermost-webapp#8215

Updated:
- Messaging > Manage Teams, Channels, and Members > Managing Channels > Switching channels
   - Updated the section to clarify that the channel switcher UI includes recently visited channels and to add a screenshot

* Added screenshot

* Update and rename source/help/getting-started/organizing-conversations.rst to source/getting-started/organizing-conversations.rst

Moved source file to its new home & updated relative image links

* Moved source file to its new home and fixed relative links

* Updated source file name and source path

* v5.37 Changelog (#4702)

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Apply suggestions from code review

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>

* Update changelog.md

* Update changelog.md

* Update changelog.md

* Add known issue

* Rename source/administration/changelog.md to source/install/self-managed-changelog.md

* Update self-managed-changelog.md

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>
Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>

* Moved source file to its new home and updated relative image links

* Moved source file to its new home and updated relative image paths

* Moved source file to its new home

* Moved the source file to its new home

* Moved source file to its new home

* Moved source file to its new home

* Moved source file to its new home

* Moved source file to its new home

* Moved source file to its new home

* Moved source file to its new home and updated ThreadAutoFollow details

* Update important-upgrade-notes.rst

* Update self-managed-changelog.md

* Update self-managed-changelog.md

* Update self-managed-changelog.md

* Update self-managed-changelog.md

* Update self-managed-changelog.md

* Update self-managed-changelog.md

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>
Co-authored-by: Justine Geffen <justinegeffen@users.noreply.github.com>
@amyblais amyblais removed the 3: Reviews Complete All reviewers have approved the pull request label Jul 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@esethna esethna esethna approved these changes

@justinegeffen justinegeffen justinegeffen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v5.37.0
Development

Successfully merging this pull request may close these issues.
4 participants
@cwarnermm @justinegeffen @esethna @amyblais