diff options
author | Josh Morel <morel.josh@hotmail.com> | 2019-04-02 05:26:47 -0400 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2019-04-02 11:26:47 +0200 |
commit | 7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 (patch) | |
tree | e75dc991369c1768804fefa114eb2a832881087f /client/src/app/core | |
parent | 12fed49ebab0c414713d57ea316b6488ae6bef99 (diff) | |
download | PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.gz PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.tar.zst PeerTube-7ccddd7b5250bd25a917a6e77e58b87b9484a2a4.zip |
add quarantine videos feature (#1637)
* add quarantine videos feature
* increase Notification settings test timeout
to 20000ms. was completing 7000 locally but timing out
after 10000 on travis
* fix quarantine video test issues
-propagate misspelling
-remove skip from server/tests/client.ts
* WIP use blacklist for moderator video approval
instead of video.quarantine boolean
* finish auto-blacklist feature
Diffstat (limited to 'client/src/app/core')
-rw-r--r-- | client/src/app/core/server/server.service.ts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/client/src/app/core/server/server.service.ts b/client/src/app/core/server/server.service.ts index acaca8a01..b0c5d1130 100644 --- a/client/src/app/core/server/server.service.ts +++ b/client/src/app/core/server/server.service.ts | |||
@@ -98,6 +98,13 @@ export class ServerService { | |||
98 | videos: { | 98 | videos: { |
99 | intervalDays: 0 | 99 | intervalDays: 0 |
100 | } | 100 | } |
101 | }, | ||
102 | autoBlacklist: { | ||
103 | videos: { | ||
104 | ofUsers: { | ||
105 | enabled: false | ||
106 | } | ||
107 | } | ||
101 | } | 108 | } |
102 | } | 109 | } |
103 | private videoCategories: Array<VideoConstant<number>> = [] | 110 | private videoCategories: Array<VideoConstant<number>> = [] |