moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'fix/autocomplete-fixes' 

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Shpuld Shpludson 2020-08-31 13:58:02 +00:00
parent 4da248f8bc acc45b49a5
commit 5b7decea3d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [Unreleased]
## [Unreleased patch] ## [Unreleased patch]
### Changed
- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
### Fixed ### Fixed
- Autocomplete won't stop at the second @, so it'll still work with "@lain@l" and not start over. - Autocomplete won't stop at the second @, so it'll still work with "@lain@l" and not start over.
- Fixed weird autocomplete behavior when you write ":custom_emoji: ?" - Fixed weird autocomplete behavior when you write ":custom_emoji: ?"

6
src/components/status_content/status_content.vue
View File

@ -71,6 +71,10 @@
v-if="attachmentTypes.includes('unknown')" v-if="attachmentTypes.includes('unknown')"
class="icon-doc" class="icon-doc"
/> />
<span
v-if="status.poll && status.poll.options"
class="icon-chart-bar"
/>
<span <span
v-if="status.card" v-if="status.card"
class="icon-link" class="icon-link"
@ -86,7 +90,7 @@
</a> </a>
</div> </div>
<div v-if="status.poll && status.poll.options"> <div v-if="status.poll && status.poll.options && !hideSubjectStatus">
<poll :base-poll="status.poll" /> <poll :base-poll="status.poll" />
</div> </div>