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
commit 5b7decea3d
2 changed files with 9 additions and 1 deletions

View File

@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
## [Unreleased patch]
### Changed
- Polls will be hidden with status content if "Collapse posts with subjects" is enabled and the post is collapsed.
### Fixed
- 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: ?"

View File

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