From 56de3d2f528a818835c04baa1c1686f91fc42161 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 24 Jan 2022 19:53:17 +0200
Subject: [PATCH 1/2] fix too-many-attachments in notifications column

---
 src/components/status_content/status_content.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 184f27834..dec8914a3 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -48,12 +48,12 @@ const StatusContent = {
       return true
     },
     attachmentSize () {
-      if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
+      if (this.compact) {
+        return 'small'
+      } else if ((this.mergedConfig.hideAttachments && !this.inConversation) ||
         (this.mergedConfig.hideAttachmentsInConv && this.inConversation) ||
         (this.status.attachments.length > this.maxThumbnails)) {
         return 'hide'
-      } else if (this.compact) {
-        return 'small'
       }
       return 'normal'
     },

From d1f02221cb8e15654da2e101d51440db1570e14d Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 24 Jan 2022 21:44:41 +0200
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50eac5758..09f767ff8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,12 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Unreleased
 ### Fixed
 - Completely hidden posts still had 1px border
+- Attachments are ALWAYS in same order as user uploaded, no more "videos first"
+- Attachment description is prefilled with backend-provided default when uploading
+- Proper visual feedback that next image is loading when browsing
 
 ### Changed
 - Settings window has been throughly rearranged to make make more sense and make navication settings easier.
+- Uploaded attachments are uniform with displayed attachments
+- Flash is watchable in media-modal (takes up nearly full screen though due to sizing issues)
+- Notifications about likes/repeats/emoji reacts are now minimized so they always take up same amount of space irrelevant to size of post.
 
 ### Added
 - Option to completely hide muted threads
+- Ability to open videos in modal even if you disabled that feature, via an icon button
+- New button on attachment that indicates that attachment has a description and shows a bar filled with description
+- Attachments are truncated just like post contents
+- Media modal now also displays description and counter position in gallery (i.e. 1/5)
+- Ability to rearrange order of attachments when uploading
 
 ## [2.4.2] - 2022-01-09
 ### Added