Merge remote-tracking branch 'upstream/dev' into feature/dark-mode

This commit is contained in:
Michael Shamoon
2020-12-29 16:53:31 -08:00
35 changed files with 366 additions and 129 deletions

View File

@@ -39,8 +39,15 @@
<label class="custom-control-label" for="darkModeEnabled">Enabled</label>
</div>
</div>
</div>
<h4 i18n>Bulk editing</h4>
<app-input-check i18n-title title="Show confirmation dialogs" formControlName="bulkEditConfirmationDialogs" i18n-hint hint="Deleting documents will always ask for confirmation."></app-input-check>
<app-input-check i18n-title title="Apply on close" formControlName="bulkEditApplyOnClose"></app-input-check>
</ng-template>
</li>
<li [ngbNavItem]="2">