From: Chocobozzz <me@florianbigard.com>
Date: Thu, 5 Sep 2019 08:19:35 +0000 (+0200)
Subject: Merge branch 'release/1.4.0' into develop
X-Git-Tag: v2.0.0-rc.1~77
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=00aab0666c6f772548c160fdfa871a8843b88f37;p=oweals%2Fpeertube.git

Merge branch 'release/1.4.0' into develop
---

00aab0666c6f772548c160fdfa871a8843b88f37
diff --cc client/src/app/+signup/+register/register.component.html
index e7440fe1e,e4d647fef..906e29aed
--- a/client/src/app/+signup/+register/register.component.html
+++ b/client/src/app/+signup/+register/register.component.html
@@@ -7,15 -7,11 +7,15 @@@
    <my-signup-success *ngIf="signupDone" [message]="success"></my-signup-success>
    <div *ngIf="info" class="alert alert-info">{{ info }}</div>
  
 -  <div class="wrapper" *ngIf="!signupDone">
 -    <div>
 +  <div class="wrapper" [hidden]="signupDone">
 +    <div class="register-form">
        <my-custom-stepper linear *ngIf="!signupDone">
-         <cdk-step [stepControl]="formStepUser" i18n-label label="User information">
+         <cdk-step [stepControl]="formStepUser" i18n-label label="User">
 -          <my-register-step-user (formBuilt)="onUserFormBuilt($event)"></my-register-step-user>
 +          <my-register-step-user
 +            [hasCodeOfConduct]="!!aboutHtml.codeOfConduct"
 +            (formBuilt)="onUserFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()"
 +          >
 +          </my-register-step-user>
  
            <button i18n cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid">Next</button>
          </cdk-step>
diff --cc server/lib/schedulers/videos-redundancy-scheduler.ts
index d326148d0,5f4aad66e..1e30f6ebc
--- a/server/lib/schedulers/videos-redundancy-scheduler.ts
+++ b/server/lib/schedulers/videos-redundancy-scheduler.ts
@@@ -261,9 -241,9 +261,9 @@@ export class VideosRedundancyScheduler 
    }
  
    private async purgeCacheIfNeeded (candidateToDuplicate: CandidateToDuplicate) {
-     while (this.isTooHeavy(candidateToDuplicate)) {
+     while (await this.isTooHeavy(candidateToDuplicate)) {
        const redundancy = candidateToDuplicate.redundancy
 -      const toDelete = await VideoRedundancyModel.loadOldestLocalThatAlreadyExpired(redundancy.strategy, redundancy.minLifetime)
 +      const toDelete = await VideoRedundancyModel.loadOldestLocalExpired(redundancy.strategy, redundancy.minLifetime)
        if (!toDelete) return
  
        await removeVideoRedundancy(toDelete)
diff --cc server/models/video/video-blacklist.ts
index b4df6cd6a,cdb725e7a..533bfe1ad
--- a/server/models/video/video-blacklist.ts
+++ b/server/models/video/video-blacklist.ts
@@@ -1,14 -1,12 +1,14 @@@
  import { AllowNull, BelongsTo, Column, CreatedAt, DataType, Default, ForeignKey, Is, Model, Table, UpdatedAt } from 'sequelize-typescript'
- import { getSortOnModel, SortType, throwIfNotValid } from '../utils'
 -import { getBlacklistSort, getSort, SortType, throwIfNotValid } from '../utils'
 -import { ScopeNames as VideoModelScopeNames, VideoModel } from './video'
++import { getBlacklistSort, SortType, throwIfNotValid } from '../utils'
 +import { VideoModel } from './video'
  import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel'
  import { isVideoBlacklistReasonValid, isVideoBlacklistTypeValid } from '../../helpers/custom-validators/video-blacklist'
  import { VideoBlacklist, VideoBlacklistType } from '../../../shared/models/videos'
  import { CONSTRAINTS_FIELDS } from '../../initializers/constants'
- import { FindOptions } from 'sequelize'
+ import { FindOptions, literal } from 'sequelize'
  import { ThumbnailModel } from './thumbnail'
 +import * as Bluebird from 'bluebird'
 +import { MVideoBlacklist, MVideoBlacklistFormattable } from '@server/typings/models'
  
  @Table({
    tableName: 'videoBlacklist',