diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-09 06:47:29 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-09 06:47:29 +0000 |
| commit | 531f150dd31ffc11b6f67145f4245b20457544aa (patch) | |
| tree | bfc192e315668dee33a6a4b87c091b7e0b0c9bfb /src/components/settings/settings.vue | |
| parent | 9768558e7c65f6a4a343d4a78b2297e4888cf77b (diff) | |
| parent | 7818d6786b8489ddc18a5cd0d63e894450ec5ead (diff) | |
Merge branch 'fix/add-option-to-hide-filtered-statues' into 'develop'
#254 Add option to hide filtered statuses
See merge request pleroma/pleroma-fe!539
Diffstat (limited to 'src/components/settings/settings.vue')
| -rw-r--r-- | src/components/settings/settings.vue | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index ba539489..dfb2e49d 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -227,7 +227,6 @@ </label> </li> </ul> - </label> </div> <div> {{$t('settings.replies_in_timeline')}} @@ -254,11 +253,18 @@ </div> </div> <div class="setting-item"> - <p>{{$t('settings.filtering_explanation')}}</p> - <textarea id="muteWords" v-model="muteWordsString"></textarea> + <div> + <p>{{$t('settings.filtering_explanation')}}</p> + <textarea id="muteWords" v-model="muteWordsString"></textarea> + </div> + <div> + <input type="checkbox" id="hideFilteredStatuses" v-model="hideFilteredStatusesLocal"> + <label for="hideFilteredStatuses"> + {{$t('settings.hide_filtered_statuses')}} {{$t('settings.instance_default', { value: hideFilteredStatusesDefault })}} + </label> + </div> </div> </div> - </tab-switcher> </keep-alive> </div> |