Merge remote-tracking branch 'origin/develop' into FEAT/open-id-connect-authentication

This commit is contained in:
Samuel Oechsler
2024-09-19 18:07:45 +02:00
189 changed files with 7744 additions and 17808 deletions

View File

@ -8,7 +8,7 @@
<div class="row">
<div class="col-sm-12 col-md-12">
<div class="form-group">
<div class="form-label"><%- description %></div>
<div class="form-label"><%- i18n('settings', 'default-site-description') %></div>
<div class="custom-controls-stacked">
<label class="custom-control custom-radio">
<input class="custom-control-input" name="value" value="congratulations" type="radio" required <%- value === 'congratulations' ? 'checked' : '' %>>
@ -18,6 +18,10 @@
<input class="custom-control-input" name="value" value="404" type="radio" required <%- value === '404' ? 'checked' : '' %>>
<div class="custom-control-label"><%- i18n('settings', 'default-site-404') %></div>
</label>
<label class="custom-control custom-radio">
<input class="custom-control-input" name="value" value="444" type="radio" required <%- value === '444' ? 'checked' : '' %>>
<div class="custom-control-label"><%- i18n('settings', 'default-site-444') %></div>
</label>
<label class="custom-control custom-radio">
<input class="custom-control-input" name="value" value="redirect" type="radio" required <%- value === 'redirect' ? 'checked' : '' %>>
<div class="custom-control-label"><%- i18n('settings', 'default-site-redirect') %></div>

View File

@ -1,7 +1,7 @@
<td>
<div><%- name %></div>
<div><%- i18n('settings', 'default-site') %></div>
<div class="small text-muted">
<%- description %>
<%- i18n('settings', 'default-site-description') %>
</div>
</td>
<td>