diff options
author | Josh Morel <morel.josh@hotmail.com> | 2019-04-02 05:26:47 -0400 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-04-02 11:26:47 +0200 |
commit | 7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 (patch) | |
tree | e75dc991369c1768804fefa114eb2a832881087f /client/src/app/+my-account/my-account-settings | |
parent | 12fed49ebab0c414713d57ea316b6488ae6bef99 (diff) | |
download | PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.gz PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.zst PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.zip |
add quarantine videos feature (#1637)
* add quarantine videos feature
* increase Notification settings test timeout
to 20000ms. was completing 7000 locally but timing out
after 10000 on travis
* fix quarantine video test issues
-propagate misspelling
-remove skip from server/tests/client.ts
* WIP use blacklist for moderator video approval
instead of video.quarantine boolean
* finish auto-blacklist feature
Diffstat (limited to 'client/src/app/+my-account/my-account-settings')
-rw-r--r-- | client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts index 8d4f2c837..67ddf54da 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts +++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts | |||
@@ -31,10 +31,12 @@ export class MyAccountNotificationPreferencesComponent implements OnInit { | |||
31 | private serverService: ServerService, | 31 | private serverService: ServerService, |
32 | private notifier: Notifier | 32 | private notifier: Notifier |
33 | ) { | 33 | ) { |
34 | |||
34 | this.labelNotifications = { | 35 | this.labelNotifications = { |
35 | newVideoFromSubscription: this.i18n('New video from your subscriptions'), | 36 | newVideoFromSubscription: this.i18n('New video from your subscriptions'), |
36 | newCommentOnMyVideo: this.i18n('New comment on your video'), | 37 | newCommentOnMyVideo: this.i18n('New comment on your video'), |
37 | videoAbuseAsModerator: this.i18n('New video abuse'), | 38 | videoAbuseAsModerator: this.i18n('New video abuse'), |
39 | videoAutoBlacklistAsModerator: this.i18n('Video auto-blacklisted waiting review'), | ||
38 | blacklistOnMyVideo: this.i18n('One of your video is blacklisted/unblacklisted'), | 40 | blacklistOnMyVideo: this.i18n('One of your video is blacklisted/unblacklisted'), |
39 | myVideoPublished: this.i18n('Video published (after transcoding/scheduled update)'), | 41 | myVideoPublished: this.i18n('Video published (after transcoding/scheduled update)'), |
40 | myVideoImportFinished: this.i18n('Video import finished'), | 42 | myVideoImportFinished: this.i18n('Video import finished'), |
@@ -46,6 +48,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit { | |||
46 | 48 | ||
47 | this.rightNotifications = { | 49 | this.rightNotifications = { |
48 | videoAbuseAsModerator: UserRight.MANAGE_VIDEO_ABUSES, | 50 | videoAbuseAsModerator: UserRight.MANAGE_VIDEO_ABUSES, |
51 | videoAutoBlacklistAsModerator: UserRight.MANAGE_VIDEO_BLACKLIST, | ||
49 | newUserRegistration: UserRight.MANAGE_USERS | 52 | newUserRegistration: UserRight.MANAGE_USERS |
50 | } | 53 | } |
51 | 54 | ||