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: Escape trademark sign #500

Merged
merged 3 commits into from
Jul 24, 2021
Merged

fix: Escape trademark sign #500

merged 3 commits into from
Jul 24, 2021

Commits on Jul 15, 2021

  1. Escape trademark sign 

    Before this, the trademark character (™) was automatically replaced with ™️ ,
showing the trademark symbol in a totally unfitting size for most contexts.
This commit avoids that by replacing the sign with its HTML escaped version
before further replacements e.g. via emojione are applied
(as can be seen in `Rocket.Chat/client/lib/renderMessageBody.ts`).

This is identical to how e.g. the registered trademark sign is currently handled.

Fixes RocketChat#7386.
    @2xB
    2xB committed Jul 15, 2021
    Configuration menu
    Copy the full SHA
    2cd16a8 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2021

  1. fix prettier error

    @2xB
    2xB authored Jul 21, 2021
    Configuration menu
    Copy the full SHA
    c45d7be View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2021

  1. Merge branch 'develop' into fix-7386-trademark

    @tassoevan
    tassoevan authored Jul 24, 2021
    Configuration menu
    Copy the full SHA
    fd07bf5 View commit details
    Browse the repository at this point in the history