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

[FIX] Rendering of emails and mentions in messages #11165

Merged
merged 8 commits into from
Jun 19, 2018
Merged

[FIX] Rendering of emails and mentions in messages #11165

merged 8 commits into from
Jun 19, 2018

Conversation

tassoevan
Copy link
Contributor

Closes #11108
This is a workaround since the message rendering system relies too much on the order of the render functions and its based on changing HTML strings.

@tassoevan tassoevan added this to the 0.66.0 milestone Jun 15, 2018
@tassoevan tassoevan requested a review from ggazzo June 15, 2018 21:15
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11165 June 15, 2018 21:16 Inactive
@tassoevan tassoevan mentioned this pull request Jun 16, 2018
Closed
ggazzo
ggazzo requested changes Jun 19, 2018
View reviewed changes
Copy link
Member

@ggazzo ggazzo left a comment

Choose a reason for hiding this comment

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

image

@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11165 June 19, 2018 13:28 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11165 June 19, 2018 14:13 Inactive
@RocketChat RocketChat deleted a comment Jun 19, 2018
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11165 June 19, 2018 16:49 Inactive
@ggazzo ggazzo merged commit c174348 into develop Jun 19, 2018
@ggazzo ggazzo deleted the fix-emails-vs-mentions branch June 19, 2018 21:02
@rodrigok rodrigok mentioned this pull request Jun 28, 2018
Merged
@tassoevan tassoevan mentioned this pull request Jul 20, 2018
Merged
ggazzo pushed a commit that referenced this pull request Jul 20, 2018
@tassoevan @ggazzo
[FIX] Check for channels property on message object before parsing me…
96ea55e 
…ntions (#11527)

This is solves a bug introduced by #11165 when replying messages that contain channel mentions.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ggazzo ggazzo ggazzo approved these changes

Assignees
No one assigned
Labels
ui/ux
Projects
None yet
Milestone
0.66.0
Development

Successfully merging this pull request may close these issues.
3 participants
@tassoevan @ggazzo @engelgabriel