Merge branch 'develop' into shorter-URLs-channels-accounts

3 files changed, 11 insertions, 0 deletions

diff --git a/shared/models/server/debug.model.ts b/shared/models/server/debug.model.ts
index 61cba6518..7ceff9137 100644
--- a/shared/models/server/debug.model.ts
+++ b/shared/models/server/debug.model.ts
@@ -1,3 +1,7 @@
 export interface Debug {
   ip: string
 }
+
+export interface SendDebugCommand {
+  command: 'remove-dandling-resumable-uploads'
+}
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 85d84af44..1667bc0e2 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -214,4 +214,10 @@ export interface ServerConfig {
     level: BroadcastMessageLevel
     dismissable: boolean
   }
+
+  homepage: {
+    enabled: boolean
+  }
 }
+
+export type HTMLServerConfig = Omit<ServerConfig, 'signup'>
diff --git a/shared/models/server/server-error-code.enum.ts b/shared/models/server/server-error-code.enum.ts
index c02b0e6c7..d17d958be 100644
--- a/shared/models/server/server-error-code.enum.ts
+++ b/shared/models/server/server-error-code.enum.ts
@@ -2,4 +2,5 @@ export const enum ServerErrorCode {
   DOES_NOT_RESPECT_FOLLOW_CONSTRAINTS = 1,
   MAX_INSTANCE_LIVES_LIMIT_REACHED = 2,
   MAX_USER_LIVES_LIMIT_REACHED = 3,
+  INCORRECT_FILES_IN_TORRENT = 4
 }