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

Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications' 

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Shpuld Shpludson 2020-06-16 14:51:12 +00:00
parent c18a8ab308 57626c125d
commit 84a69f9502
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -30,7 +30,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Newlines in the muted words settings work again - Newlines in the muted words settings work again
- Clicking on non-latin hashtags won't open a new window - Clicking on non-latin hashtags won't open a new window
- Uploading and drag-dropping multiple files works correctly now. - Uploading and drag-dropping multiple files works correctly now.
- Fix status ellipsis menu being cut off in notifications column. - Subject field now appears disabled when posting
- Fix status ellipsis menu being cut off in notifications column
## [2.0.3] - 2020-05-02 ## [2.0.3] - 2020-05-02
### Fixed ### Fixed

1
src/components/post_status_form/post_status_form.vue
View File

@ -81,6 +81,7 @@
v-model="newStatus.spoilerText" v-model="newStatus.spoilerText"
type="text" type="text"
:placeholder="$t('post_status.content_warning')" :placeholder="$t('post_status.content_warning')"
:disabled="posting"
class="form-post-subject" class="form-post-subject"
> >
</EmojiInput> </EmojiInput>