Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

ABC-122 Handle custom emojis in channel header and login page #677

Merged
merged 5 commits into from
Feb 2, 2018

Conversation

jwilander
Copy link
Member

Summary

Based on #673.

Ticket Link

https://mattermost.atlassian.net/browse/ABC-122

Checklist

  • Ran make check-style to check for style errors (required for all pull requests)
  • Ran make test to ensure unit and component tests passed
  • Has redux changes (please link)
  • Has UI changes

@jwilander jwilander added the Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) label Jan 29, 2018
@jwilander jwilander added this to the v4.7.0 milestone Jan 29, 2018
@jwilander jwilander added 2: Dev Review Requires review by a core commiter and removed Do Not Merge/Awaiting PR Awaiting another pull request before merging (e.g. server changes) labels Feb 1, 2018
@jespino jespino added the Setup Old Test Server Triggers the creation of a test server label Feb 1, 2018
Copy link
Member

@jespino jespino left a comment

Choose a reason for hiding this comment

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

looks good, except for the comment.

onClick={Utils.handleFormattedTextClick}
dangerouslySetInnerHTML={{__html: TextFormatting.formatText(channel.header, textFormattingOptions)}}
/>
<span>{messageHtmlToComponent(formattedText, false, {mentions: false})}</span>
Copy link
Member

Choose a reason for hiding this comment

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

I think here the handleFormattedTextClick is still needed. For example, I can't click a hashtag link.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh yeah, that was an accidental removal. I'll add it back

@jespino jespino removed the Setup Old Test Server Triggers the creation of a test server label Feb 1, 2018
@mattermost mattermost deleted a comment from mattermod Feb 1, 2018
@mattermost mattermost deleted a comment from mattermod Feb 1, 2018
@jwilander
Copy link
Member Author

@jespino fixed

@jwilander jwilander added 4: Reviews Complete All reviewers have approved the pull request and removed 2: Dev Review Requires review by a core commiter labels Feb 2, 2018
@jwilander jwilander merged commit f0f7ec9 into master Feb 2, 2018
@jwilander jwilander deleted the abc-122 branch February 2, 2018 19:17
@amyblais amyblais added Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation labels Feb 2, 2018
@lindalumitchell lindalumitchell added the Tests/Not Needed Does not require new release tests label Feb 3, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Done Required changelog entry has been written Docs/Not Needed Does not require documentation Tests/Not Needed Does not require new release tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants