set patch date to correct

Update MASTER with develop for 2.2.1
Merge branch 'patch-1' into 'develop'
2026-06-04 22:30:04 -04:00 · 2020-11-11 22:32:44 +02:00 · 2020-11-09 11:13:49 +02:00 · 2020-11-09 09:08:41 +00:00 · 2020-11-09 09:01:16 +00:00 · 2020-11-09 08:58:17 +00:00
2 changed files with 13 additions and 6 deletions
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [2.2.1] - 2020-11-11
 ### Fixed
 - Fixed regression in react popup alignment and overflowing
 ## [2.2.0] - 2020-11-06
 ### Added
 - New option to optimize timeline rendering to make the site more responsive (enabled by default)
@@ -4,6 +4,7 @@
    placement="top"
    :offset="{ y: 5 }"
    class="react-button-popover"
    :bound-to="{ x: 'container' }"
  >
    <div
      slot="content"
@@ -37,12 +38,13 @@
        <div class="reaction-bottom-fader" />
      </div>
    </div>
    <span slot="trigger">
      <FAIcon
      slot="trigger"
        class="fa-scale-110 fa-old-padding add-reaction-button"
        :icon="['far', 'smile-beam']"
        :title="$t('tool_tip.add_reaction')"
      />
    </span>
  </Popover>
 </template>
Author	SHA1	Message	Date
Shpuld Shpuldson	a7567ce6d0	set patch date to correct	2020-11-11 22:32:44 +02:00
Shpuld Shpuldson	8e87e3d88b	Update MASTER with develop for 2.2.1	2020-11-09 11:13:49 +02:00
Shpuld Shpludson	3963f240d5	Merge branch 'patch-1' into 'develop' Update CHANGELOG.md See merge request pleroma/pleroma-fe!1281	2020-11-09 09:08:41 +00:00
Shpuld Shpludson	9ff48b88bf	Update CHANGELOG.md	2020-11-09 09:01:16 +00:00
Shpuld Shpludson	3220e72eb9	Merge branch 'patch-1' into 'develop' Update CHANGELOG.md to match master See merge request pleroma/pleroma-fe!1279	2020-11-09 08:58:17 +00:00
HJ	def1bd0676	Merge branch 'fix/react-menu-overflow-fix' into 'develop' Fix #994 react popover overflowing Closes #994 See merge request pleroma/pleroma-fe!1280	2020-11-09 08:40:59 +00:00
Shpuld Shpuldson	9f96b592d4	wrap react button icon to a span to fix popover overflow	2020-11-09 09:40:20 +02:00
Shpuld Shpludson	82f17961d1	Update CHANGELOG.md to match master	2020-11-06 17:36:43 +00:00