diff options
| author | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
|---|---|---|
| committer | Chocobozzz <chocobozzz@framasoft.org> | 2020-06-11 10:36:04 +0200 |
| commit | fa58a19819cb821a5c5a26802efd492461be9c04 (patch) | |
| tree | 72bd8307da8ac447bb9934b1301ab0d93ea97e6b /client/src/app/videos/recommendations/recommended-videos.component.html | |
| parent | 50a04125dac1a126cb79a9fb575fcf673c5ac2d6 (diff) | |
| parent | e95bede8fe660a38c99e51560caa5dd58a8eb23e (diff) | |
| download | PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.gz PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.tar.zst PeerTube-fa58a19819cb821a5c5a26802efd492461be9c04.zip | |
Merge branch 'blacklist' into 'develop'
rename blacklist to block/blocklist, merge block and auto-block views
See merge request framasoft/peertube/PeerTube!30
Diffstat (limited to 'client/src/app/videos/recommendations/recommended-videos.component.html')
| -rw-r--r-- | client/src/app/videos/recommendations/recommended-videos.component.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/videos/recommendations/recommended-videos.component.html index c6bdfee46..e4568c309 100644 --- a/client/src/app/videos/recommendations/recommended-videos.component.html +++ b/client/src/app/videos/recommendations/recommended-videos.component.html | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | </div> | 13 | </div> |
| 14 | 14 | ||
| 15 | <div *ngFor="let video of (videos$ | async); let i = index; let length = count"> | 15 | <div *ngFor="let video of (videos$ | async); let i = index; let length = count"> |
| 16 | <my-video-miniature [displayOptions]="displayOptions" [video]="video" [user]="user" (videoBlacklisted)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()"> | 16 | <my-video-miniature [displayOptions]="displayOptions" [video]="video" [user]="user" (videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()"> |
| 17 | </my-video-miniature> | 17 | </my-video-miniature> |
| 18 | 18 | ||
| 19 | <hr *ngIf="!playlist && i == 0 && length > 1" /> | 19 | <hr *ngIf="!playlist && i == 0 && length > 1" /> |