Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: allows to ignore a user forever (#10074)

This commit is contained in:
Joffrey JAFFEUX 2020-06-18 17:24:07 +02:00 committed by GitHub
parent e31471585a
commit b8c676e727
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/templates/components/future-date-input.hbs
View File

@ -13,9 +13,11 @@
includeMidFuture=includeMidFuture includeMidFuture=includeMidFuture
includeNow=includeNow includeNow=includeNow
clearable=clearable clearable=clearable
none="topic.auto_update_input.none"
onChangeInput=onChangeInput onChangeInput=onChangeInput
onChange=(action (mut selection)) onChange=(action (mut selection))
options=(hash
none="topic.auto_update_input.none"
)
}} }}
</div> </div>
{{/unless}} {{/unless}}

2
app/assets/javascripts/discourse/app/templates/modal/ignore-duration-with-username.hbs
View File

@ -12,7 +12,7 @@
includeWeekend=true includeWeekend=true
includeDateTime=false includeDateTime=false
includeMidFuture=true includeMidFuture=true
includeFarFuture=false includeFarFuture=true
onChangeInput=(action (mut ignoredUntil)) onChangeInput=(action (mut ignoredUntil))
}} }}
<p>{{i18n "user.user_notifications.ignore_duration_note"}}</p> <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>

2
app/assets/javascripts/discourse/app/templates/modal/ignore-duration.hbs
View File

@ -5,7 +5,7 @@
includeWeekend=true includeWeekend=true
includeDateTime=false includeDateTime=false
includeMidFuture=true includeMidFuture=true
includeFarFuture=false includeFarFuture=true
onChangeInput=(action (mut ignoredUntil)) onChangeInput=(action (mut ignoredUntil))
}} }}
<p>{{i18n "user.user_notifications.ignore_duration_note"}}</p> <p>{{i18n "user.user_notifications.ignore_duration_note"}}</p>

2
app/assets/stylesheets/common/components/ignored-user-list.scss
View File

@ -11,7 +11,7 @@
.ignored-user-list-item { .ignored-user-list-item {
border: 1px solid $primary-medium; border: 1px solid $primary-medium;
border-radius: 0.25em; border-radius: 5px;
padding: 0; padding: 0;
display: flex; display: flex;
align-items: center; align-items: center;