diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-06-16 14:51:12 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-06-16 14:51:12 +0000 |
| commit | 84a69f9502f82365ea682acd2932ba37417dfcdf (patch) | |
| tree | c9ce0a16d0d29bd2a42accbda1632c1d07142bb2 | |
| parent | c18a8ab308e6ebbc552e623d6e035032cec4a619 (diff) | |
| parent | 57626c125d0477716a638854c4243ee0fde96923 (diff) | |
Merge branch 'develop' into 'fix/popovers-cutting-off-in-notifications'
# Conflicts:
# CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/components/post_status_form/post_status_form.vue | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a9a9046..5dfe741c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 - Clicking on non-latin hashtags won't open a new window - 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 ### Fixed diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index c4d7f7e2..e3d8d087 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -81,6 +81,7 @@ v-model="newStatus.spoilerText" type="text" :placeholder="$t('post_status.content_warning')" + :disabled="posting" class="form-post-subject" > </EmojiInput> |