diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /shared/models/server/custom-config.model.ts | |
parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'shared/models/server/custom-config.model.ts')
-rw-r--r-- | shared/models/server/custom-config.model.ts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts index 3afd36fcd..b42ff90c6 100644 --- a/shared/models/server/custom-config.model.ts +++ b/shared/models/server/custom-config.model.ts | |||
@@ -41,6 +41,10 @@ export interface CustomConfig { | |||
41 | email: string | 41 | email: string |
42 | } | 42 | } |
43 | 43 | ||
44 | contactForm: { | ||
45 | enabled: boolean | ||
46 | } | ||
47 | |||
44 | user: { | 48 | user: { |
45 | videoQuota: number | 49 | videoQuota: number |
46 | videoQuotaDaily: number | 50 | videoQuotaDaily: number |
@@ -48,6 +52,7 @@ export interface CustomConfig { | |||
48 | 52 | ||
49 | transcoding: { | 53 | transcoding: { |
50 | enabled: boolean | 54 | enabled: boolean |
55 | allowAdditionalExtensions: boolean | ||
51 | threads: number | 56 | threads: number |
52 | resolutions: { | 57 | resolutions: { |
53 | '240p': boolean | 58 | '240p': boolean |
@@ -56,6 +61,9 @@ export interface CustomConfig { | |||
56 | '720p': boolean | 61 | '720p': boolean |
57 | '1080p': boolean | 62 | '1080p': boolean |
58 | } | 63 | } |
64 | hls: { | ||
65 | enabled: boolean | ||
66 | } | ||
59 | } | 67 | } |
60 | 68 | ||
61 | import: { | 69 | import: { |