From 3b3b18203fe73e499bf8b49b15369710df95993e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 5 Dec 2018 15:10:45 +0100
Subject: Add error when email system is not configured and using the forgot
 password system

---
 shared/models/server/server-config.model.ts | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'shared/models/server')

diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 91196c1eb..a6d28e05e 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -15,6 +15,10 @@ export interface ServerConfig {
     }
   }
 
+  email: {
+    enabled: boolean
+  }
+
   signup: {
     allowed: boolean,
     allowedForCurrentIP: boolean,
-- 
cgit v1.2.3


From 14e2014acc1362cfbb770c051a7254b156cd8efb Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 11 Dec 2018 14:52:50 +0100
Subject: Support additional video extensions

---
 shared/models/server/custom-config.model.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared/models/server')

diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 3afd36fcd..028aafa1a 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -48,6 +48,7 @@ export interface CustomConfig {
 
   transcoding: {
     enabled: boolean
+    allowAdditionalExtensions: boolean
     threads: number
     resolutions: {
       '240p': boolean
-- 
cgit v1.2.3


From a4101923e699e49ceb9ff36e971c75417fafc9f0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Wed, 9 Jan 2019 15:14:29 +0100
Subject: Implement contact form on server side

---
 shared/models/server/contact-form.model.ts  | 5 +++++
 shared/models/server/custom-config.model.ts | 4 ++++
 shared/models/server/index.ts               | 6 ++++++
 shared/models/server/server-config.model.ts | 4 ++++
 4 files changed, 19 insertions(+)
 create mode 100644 shared/models/server/contact-form.model.ts
 create mode 100644 shared/models/server/index.ts

(limited to 'shared/models/server')

diff --git a/shared/models/server/contact-form.model.ts b/shared/models/server/contact-form.model.ts
new file mode 100644
index 000000000..0696be8b4
--- /dev/null
+++ b/shared/models/server/contact-form.model.ts
@@ -0,0 +1,5 @@
+export interface ContactForm {
+  fromEmail: string
+  fromName: string
+  body: string
+}
diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 028aafa1a..7a3eaa33f 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -41,6 +41,10 @@ export interface CustomConfig {
     email: string
   }
 
+  contactForm: {
+    enabled: boolean
+  }
+
   user: {
     videoQuota: number
     videoQuotaDaily: number
diff --git a/shared/models/server/index.ts b/shared/models/server/index.ts
new file mode 100644
index 000000000..c42f6f67f
--- /dev/null
+++ b/shared/models/server/index.ts
@@ -0,0 +1,6 @@
+export * from './about.model'
+export * from './contact-form.model'
+export * from './custom-config.model'
+export * from './job.model'
+export * from './server-config.model'
+export * from './server-stats.model'
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index a6d28e05e..7031009d9 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -19,6 +19,10 @@ export interface ServerConfig {
     enabled: boolean
   }
 
+  contactForm: {
+    enabled: boolean
+  }
+
   signup: {
     allowed: boolean,
     allowedForCurrentIP: boolean,
-- 
cgit v1.2.3


From 9b4b15f91c485f9a7fe2ed314b4101f4b7506b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20B=C3=A9ranger?=
 <43744761+auberanger@users.noreply.github.com>
Date: Mon, 14 Jan 2019 09:06:48 +0100
Subject: WIP : Indicate to users how "trending" works (#1458)

* Get the INTERVAL_DAYS const in the video-trending component

* Change Trending section title

* Add a tooltip to explain how trending section works

* Minor CSS fix for the my-feed popover next to the titlepage
---
 shared/models/server/server-config.model.ts | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'shared/models/server')

diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 7031009d9..f4245ed4d 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -78,4 +78,10 @@ export interface ServerConfig {
     videoQuota: number
     videoQuotaDaily: number
   }
+
+  trending: {
+    videos: {
+      intervalDays: number
+    }
+  }
 }
-- 
cgit v1.2.3


From 44b9c0ba31c4a97e3d874f33226ad935c3a90dd5 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 15 Jan 2019 09:45:54 +0100
Subject: Add totalLocalVideoFilesSize in stats

---
 shared/models/server/server-stats.model.ts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'shared/models/server')

diff --git a/shared/models/server/server-stats.model.ts b/shared/models/server/server-stats.model.ts
index a6bd2d4d3..74f3de5d3 100644
--- a/shared/models/server/server-stats.model.ts
+++ b/shared/models/server/server-stats.model.ts
@@ -5,6 +5,7 @@ export interface ServerStats {
   totalLocalVideos: number
   totalLocalVideoViews: number
   totalLocalVideoComments: number
+  totalLocalVideoFilesSize: number
 
   totalVideos: number
   totalVideoComments: number
-- 
cgit v1.2.3