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.

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

[FIX] Properly escape custom emoji names for pattern matching #13408

Merged
merged 3 commits into from
Feb 13, 2019

Conversation

tassoevan
Copy link
Contributor

Closes #10925

@tassoevan tassoevan added this to the 0.74.3 milestone Feb 7, 2019
@tassoevan tassoevan self-assigned this Feb 7, 2019
@tassoevan tassoevan requested a review from ggazzo February 7, 2019 19:51
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13408 February 7, 2019 19:51 Inactive
@ggazzo ggazzo merged commit adf2d3e into develop Feb 13, 2019
@ggazzo ggazzo deleted the fix/custom-emoji-matching branch February 13, 2019 00:47
sampaiodiego pushed a commit that referenced this pull request Feb 14, 2019
* Properly escape custom emoji names for pattern matching

* Cache regexp to render ~3.4 times faster
@sampaiodiego sampaiodiego mentioned this pull request Feb 14, 2019
bhardwajaditya pushed a commit to bhardwajaditya/Rocket.Chat that referenced this pull request Mar 17, 2019
…Chat#13408)

* Properly escape custom emoji names for pattern matching

* Cache regexp to render ~3.4 times faster
wreiske added a commit to wreiske/Rocket.Chat that referenced this pull request Apr 28, 2019
…nto ldap-admin-groups

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (21 commits)
  Regression: Active room was not being marked (RocketChat#14276)
  Rename Cloud to Connectivity Services & split Apps in Apps and Marketplace (RocketChat#14211)
  LingoHub based on develop (RocketChat#14178)
  [IMPROVE] Replace livechat inquiry dialog with preview room (RocketChat#13986)
  Bump version to 0.74.3
  Room loading improvements (RocketChat#13471)
  [FIX] Invalid condition on getting next livechat agent over REST API endpoint (RocketChat#13360)
  [IMPROVE] Open rooms quicker (RocketChat#13417)
  [FIX] "Test Desktop Notifications" not triggering a notification (RocketChat#13457)
  [FIX] Translated and incorrect i18n variables (RocketChat#13463)
  Regression: Remove console.log on email translations (RocketChat#13456)
  [FIX] Properly escape custom emoji names for pattern matching (RocketChat#13408)
  [FIX] Not translated emails (RocketChat#13452)
  Added missing package dependency (RocketChat#13437)
  Update Russian localization (RocketChat#13244)
  [IMPROVE] Allow configure Prometheus port per process via Env Var (RocketChat#13436)
  [IMPROVE] Add API option "permissionsRequired" (RocketChat#13430)
  [FIX] Several Problems on HipChat Importer (RocketChat#13336)
  Add the missing uniqueId to the push notifications (RocketChat#13423)
  [FIX] Notify private settings changes even on public settings changed (RocketChat#13369)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants