Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Merge branch 'release/v8.2.x' into develop

Chocobozzz05c6325809f4
diff --cc client/src/app/+video-watch/shared/information/video-alert.component.ts
index 69e0271945,abacd3b5ab..87eb192c92
--- a/client/src/app/+video-watch/shared/information/video-alert.component.ts
+++ b/client/src/app/+video-watch/shared/information/video-alert.component.ts
@@@ -1,4 -1,4 +1,4 @@@
- import { Component, inject, input, ChangeDetectionStrategy } from '@angular/core'
-import { Component, computed, inject, input } from '@angular/core'
++import { ChangeDetectionStrategy, Component, computed, inject, input } from '@angular/core'
import { AuthUser } from '@app/core'
import { AlertComponent } from '@app/shared/shared-main/common/alert.component'
import { PTDatePipe } from '@app/shared/shared-main/common/date.pipe'
diff --cc client/src/app/shared/shared-channels/channel-toggle.component.ts
index 176f6044e9,e8a0f229f1..40b783b92a
--- a/client/src/app/shared/shared-channels/channel-toggle.component.ts
+++ b/client/src/app/shared/shared-channels/channel-toggle.component.ts
@@@ -1,5 -1,5 +1,5 @@@
- import { CommonModule } from '@angular/common'
- import { Component, forwardRef, inject, input, model, ChangeDetectionStrategy } from '@angular/core'
+ import { CommonModule, getLocaleDirection } from '@angular/common'
-import { Component, forwardRef, inject, input, LOCALE_ID, model } from '@angular/core'
++import { ChangeDetectionStrategy, Component, forwardRef, inject, input, LOCALE_ID, model } from '@angular/core'
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
import { AuthService } from '@app/core'
import { VideoChannel } from '@peertube/peertube-models'
diff --cc client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
index 417042d1de,fc10d4641f..2ddab64839
--- a/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
+++ b/client/src/app/shared/shared-thumbnail/video-thumbnail.component.ts
@@@ -1,5 -1,5 +1,5 @@@
- import { CommonModule } from '@angular/common'
- import { booleanAttribute, Component, input, OnChanges, output, viewChild, ChangeDetectionStrategy } from '@angular/core'
+ import { CommonModule, getLocaleDirection } from '@angular/common'
-import { booleanAttribute, Component, inject, input, LOCALE_ID, OnChanges, output, viewChild } from '@angular/core'
++import { booleanAttribute, ChangeDetectionStrategy, Component, inject, input, LOCALE_ID, OnChanges, output, viewChild } from '@angular/core'
import { RouterLink } from '@angular/router'
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
import { Video as VideoServerModel, VideoState } from '@peertube/peertube-models'