hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'proper-attachments' into shigusegubu

Browse source 
* proper-attachments:
  changelog
  fix too-many-attachments in notifications column
This commit is contained in:
Henry Jameson 2022-01-24 21:47:46 +02:00
commit 5b2a802921
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CHANGELOG.md
View file

@ -6,12 +6,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## Unreleased ## Unreleased
### Fixed ### Fixed
- Completely hidden posts still had 1px border - 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 ### Changed
- Settings window has been throughly rearranged to make make more sense and make navication settings easier. - 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 ### Added
- Option to completely hide muted threads - 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 ## [2.4.2] - 2022-01-09
### Added ### Added

6
src/components/status_content/status_content.js
View file

@ -48,12 +48,12 @@ const StatusContent = {
return true return true
}, },
attachmentSize () { 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.mergedConfig.hideAttachmentsInConv && this.inConversation) ||
(this.status.attachments.length > this.maxThumbnails)) { (this.status.attachments.length > this.maxThumbnails)) {
return 'hide' return 'hide'
} else if (this.compact) {
return 'small'
} }
return 'normal' return 'normal'
}, },