Skip to content

4.0 #3403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thorsten wants to merge 7 commits into from
Closed

4.0 #3403

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6522ccc
feat: added require attributes
thorsten Mar 10, 2025
acda0d3
docs: added hint for LDAP with a self-signed certificate
thorsten Mar 14, 2025
ee2330a
build: corrected Elasticsearch for Docker on Apple Silicon
thorsten Mar 15, 2025
b4135af
fix: added missing update queries for fr_CA and pt_BR (#3400)
thorsten Mar 20, 2025
031b1c2
fix: just log errors if they are not that important
thorsten Mar 21, 2025
00c269a
fix: corrected type error if number of search results is null
thorsten Mar 21, 2025
183be91
Merge branch 'main' into 4.0
thorsten Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions phpmyfaq/assets/templates/admin/content/faq.editor.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
</div>
{% endif %}

<form id="faqEditor" method="post" data-pmf-enable-editor="{{ isEditorEnabled }}"
data-pmf-editor-language="en" data-pmf-default-url="{{ defaultUrl }}">
<form id="faqEditor" method="post" data-pmf-enable-editor="{{ isEditorEnabled }}" class="needs-validation"
data-pmf-editor-language="en" data-pmf-default-url="{{ defaultUrl }}" novalidate>

<input type="hidden" name="revisionId" id="revisionId" value="{{ faqRevisionId }}">
<input type="hidden" name="faqId" id="faqId" value="{{ faqData['id'] }}">
Expand All @@ -102,7 +102,7 @@
<!-- Question -->
<div class="form-group mb-2">
<input type="text" name="question" id="question" class="form-control form-control-lg"
placeholder="{{ 'msgQuestion' | translate }}" value="{{ faqData['title'] }}">
placeholder="{{ 'msgQuestion' | translate }}" value="{{ faqData['title'] }}" required>
<small id="questionHelp" class="form-text visually-hidden">
{{ 'msgNoHashAllowed' | translate }}
</small>
Expand All @@ -113,7 +113,7 @@
<div class="row">
<div class="col-lg-12">
<noscript>Please enable JavaScript to use the WYSIWYG editor!</noscript>
<textarea id="editor" name="answer" class="form-control" rows="7"
<textarea id="editor" name="answer" class="form-control" rows="7" required
placeholder="{{ 'msgAnswer' | translate }}"
>{{ faqData['content'] | raw }}</textarea>
</div>
Expand Down Expand Up @@ -182,7 +182,7 @@
{{ 'msgCategory' | translate }}
</label>
<div class="col-6">
<select class="form-control" name="categories[]" id="phpmyfaq-categories" size="5" multiple>
<select class="form-control" name="categories[]" id="phpmyfaq-categories" size="5" multiple required>
{{ categoryOptions | raw }}
</select>
</div>
Expand Down Expand Up @@ -261,15 +261,17 @@
{{ 'msgAuthor' | translate }}
</label>
<div class="col-lg-10">
<input type="text" name="author" id="author" value="{{ faqData['author'] }}" class="form-control">
<input type="text" name="author" id="author" value="{{ faqData['author'] }}" class="form-control"
required>
</div>
</div>

<!-- E-Mail -->
<div class="row mb-2">
<label class="col-lg-2 col-form-label" for="email">{{ 'msgEmail' | translate }}</label>
<div class="col-lg-10">
<input type="email" name="email" id="email" value="{{ faqData['email'] | raw }}" class="form-control">
<input type="email" name="email" id="email" value="{{ faqData['email'] | raw }}" class="form-control"
required>
</div>
</div>

Expand Down