diff options
author | Chocobozzz <me@florianbigard.com> | 2018-12-11 14:52:50 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-12-11 15:11:09 +0100 |
commit | 14e2014acc1362cfbb770c051a7254b156cd8efb (patch) | |
tree | 8b7d5aedd9fe0beff8b971c9bae7781ba2069228 /client/src/app/+admin/config/edit-custom-config | |
parent | 8923187455c5aa7167d813c5c745d3857f183fd7 (diff) | |
download | PeerTube-14e2014acc1362cfbb770c051a7254b156cd8efb.tar.gz PeerTube-14e2014acc1362cfbb770c051a7254b156cd8efb.tar.zst PeerTube-14e2014acc1362cfbb770c051a7254b156cd8efb.zip |
Support additional video extensions
Diffstat (limited to 'client/src/app/+admin/config/edit-custom-config')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 8 | ||||
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | 3 |
2 files changed, 11 insertions, 0 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index fd4d3d9c9..6ece7e8bc 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -220,6 +220,14 @@ | |||
220 | <ng-template [ngIf]="isTranscodingEnabled()"> | 220 | <ng-template [ngIf]="isTranscodingEnabled()"> |
221 | 221 | ||
222 | <div class="form-group"> | 222 | <div class="form-group"> |
223 | <my-peertube-checkbox | ||
224 | inputName="transcodingAllowAdditionalExtensions" formControlName="transcodingAllowAdditionalExtensions" | ||
225 | i18n-labelText labelText="Allow additional extensions" | ||
226 | i18n-helpHtml helpHtml="Allow your users to upload .mkv, .mov, .avi, .flv videos" | ||
227 | ></my-peertube-checkbox> | ||
228 | </div> | ||
229 | |||
230 | <div class="form-group"> | ||
223 | <label i18n for="transcodingThreads">Transcoding threads</label> | 231 | <label i18n for="transcodingThreads">Transcoding threads</label> |
224 | <div class="peertube-select-container"> | 232 | <div class="peertube-select-container"> |
225 | <select id="transcodingThreads" formControlName="transcodingThreads"> | 233 | <select id="transcodingThreads" formControlName="transcodingThreads"> |
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts index f48b6fc1a..6eea1cd76 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts | |||
@@ -82,6 +82,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
82 | userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, | 82 | userVideoQuota: this.userValidatorsService.USER_VIDEO_QUOTA, |
83 | userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, | 83 | userVideoQuotaDaily: this.userValidatorsService.USER_VIDEO_QUOTA_DAILY, |
84 | transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, | 84 | transcodingThreads: this.customConfigValidatorsService.TRANSCODING_THREADS, |
85 | transcodingAllowAdditionalExtensions: null, | ||
85 | transcodingEnabled: null, | 86 | transcodingEnabled: null, |
86 | customizationJavascript: null, | 87 | customizationJavascript: null, |
87 | customizationCSS: null | 88 | customizationCSS: null |
@@ -163,6 +164,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
163 | }, | 164 | }, |
164 | transcoding: { | 165 | transcoding: { |
165 | enabled: this.form.value['transcodingEnabled'], | 166 | enabled: this.form.value['transcodingEnabled'], |
167 | allowAdditionalExtensions: this.form.value['transcodingAllowAdditionalExtensions'], | ||
166 | threads: this.form.value['transcodingThreads'], | 168 | threads: this.form.value['transcodingThreads'], |
167 | resolutions: { | 169 | resolutions: { |
168 | '240p': this.form.value[this.getResolutionKey('240p')], | 170 | '240p': this.form.value[this.getResolutionKey('240p')], |
@@ -221,6 +223,7 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit { | |||
221 | userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily, | 223 | userVideoQuotaDaily: this.customConfig.user.videoQuotaDaily, |
222 | transcodingThreads: this.customConfig.transcoding.threads, | 224 | transcodingThreads: this.customConfig.transcoding.threads, |
223 | transcodingEnabled: this.customConfig.transcoding.enabled, | 225 | transcodingEnabled: this.customConfig.transcoding.enabled, |
226 | transcodingAllowAdditionalExtensions: this.customConfig.transcoding.allowAdditionalExtensions, | ||
224 | customizationJavascript: this.customConfig.instance.customizations.javascript, | 227 | customizationJavascript: this.customConfig.instance.customizations.javascript, |
225 | customizationCSS: this.customConfig.instance.customizations.css, | 228 | customizationCSS: this.customConfig.instance.customizations.css, |
226 | importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, | 229 | importVideosHttpEnabled: this.customConfig.import.videos.http.enabled, |