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/search | |
| 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/search')
| -rw-r--r-- | client/src/app/search/search.component.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html index 3cafc676d..d723606db 100644 --- a/client/src/app/search/search.component.html +++ b/client/src/app/search/search.component.html | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | <my-video-miniature | 55 | <my-video-miniature |
| 56 | [video]="result" [user]="user" [displayAsRow]="true" [displayVideoActions]="!hideActions()" | 56 | [video]="result" [user]="user" [displayAsRow]="true" [displayVideoActions]="!hideActions()" |
| 57 | [useLazyLoadUrl]="advancedSearch.searchTarget === 'search-index'" | 57 | [useLazyLoadUrl]="advancedSearch.searchTarget === 'search-index'" |
| 58 | (videoBlacklisted)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)" | 58 | (videoBlocked)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)" |
| 59 | ></my-video-miniature> | 59 | ></my-video-miniature> |
| 60 | </div> | 60 | </div> |
| 61 | </ng-container> | 61 | </ng-container> |