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/+admin/config/edit-custom-config/edit-custom-config.component.html | |
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/+admin/config/edit-custom-config/edit-custom-config.component.html')
-rw-r--r-- | client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html index 6b654c67d..00a0d98f8 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html | |||
@@ -161,6 +161,23 @@ | |||
161 | </ng-container> | 161 | </ng-container> |
162 | </ng-container> | 162 | </ng-container> |
163 | 163 | ||
164 | <div i18n class="inner-form-title">Auto-blacklist</div> | ||
165 | |||
166 | <ng-container formGroupName="autoBlacklist"> | ||
167 | <ng-container formGroupName="videos"> | ||
168 | <ng-container formGroupName="ofUsers"> | ||
169 | |||
170 | <div class="form-group"> | ||
171 | <my-peertube-checkbox | ||
172 | inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled" | ||
173 | i18n-labelText labelText="New videos of users automatically blacklisted enabled" | ||
174 | ></my-peertube-checkbox> | ||
175 | </div> | ||
176 | |||
177 | </ng-container> | ||
178 | </ng-container> | ||
179 | </ng-container> | ||
180 | |||
164 | <div i18n class="inner-form-title">Administrator</div> | 181 | <div i18n class="inner-form-title">Administrator</div> |
165 | 182 | ||
166 | <div class="form-group" formGroupName="admin"> | 183 | <div class="form-group" formGroupName="admin"> |