From 7ccddd7b5250bd25a917a6e77e58b87b9484a2a4 Mon Sep 17 00:00:00 2001 From: Josh Morel Date: Tue, 2 Apr 2019 05:26:47 -0400 Subject: 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 --- config/default.yaml | 6 ++++++ config/production.yaml.example | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'config') diff --git a/config/default.yaml b/config/default.yaml index c5bf8e457..615910478 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -162,6 +162,12 @@ import: torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) enabled: false +auto_blacklist: + # New videos automatically blacklisted so moderators can review before publishing + videos: + of_users: + enabled: false + instance: name: 'PeerTube' short_description: 'PeerTube, a federated (ActivityPub) video streaming platform using P2P (BitTorrent) directly in the web browser with WebTorrent and Angular.' diff --git a/config/production.yaml.example b/config/production.yaml.example index 306e5576d..5299484a5 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -176,6 +176,12 @@ import: torrent: # Magnet URI or torrent file (use classic TCP/UDP/WebSeed to download the file) enabled: false +auto_blacklist: + # New videos automatically blacklisted so moderators can review before publishing + videos: + of_users: + enabled: false + # Instance settings instance: name: 'PeerTube' -- cgit v1.2.3