# Conflicts:
#   src/components/emoji_reactions/emoji_reactions.vue

themes to have derived colors instead of fixed ones.

Emoji Reactions - fixes and improvements

See merge request pleroma/pleroma-fe!1051

* upstream/develop:
  Fix one click nsfw unhide on videos
  Escape HTML from display name and subject fields

Add setting for allow following move

Closes #732

See merge request pleroma/pleroma-fe!1054

Indicate whether collapsed statuses contain gallery media or link preview cards

Closes #767

See merge request pleroma/pleroma-fe!1056

MRF Keyword Policy Disclosure

See merge request pleroma/pleroma-fe!1055

context-aware `mod` argument - now checks lightness of "variant" color. needs
retesting tho

Escape HTML from display name and subject fields

Closes #724

See merge request pleroma/pleroma-fe!1052

Fix one click nsfw unhide on videos

See merge request pleroma/pleroma-fe!1053

Closes #724

* upstream/develop: (33 commits)
  add emoji reactions to changelog
  fix emoji reaction classes broken in develop
  review changes
  Fix password and email update
  remove unnecessary anonymous function
  Apply suggestion to src/services/api/api.service.js
  remove logs/commented code
  remove favs count from react button
  remove mock data
  change emoji reactions to use new format
  Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
  Fix missing TWKN when logged in, but server is set to private mode.
  Fix follower request fetching
  Add domain mutes to changelog
  Implement domain mutes v2
  change changelog to reflect actual release history of frontend
  Fix #750 , fix error messages and captcha resetting
  Optimize Notifications Rendering
  update CHANGELOG
  Use last seen notif instead of first unseen notif for sinceId
  ...

Emoji reactions

See merge request pleroma/pleroma-fe!1049

Fix email and password forms in user settings

See merge request pleroma/pleroma-fe!1050

Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe into feat/emoji-reactions