merge upgrade-sf5 branch to have latest fixes

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue

@@ -52,7 +52,7 @@
 
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import ClassicEditor from "../../../../../../ChillMainBundle/Resources/public/module/ckeditor5/editor_config";
 import { mapState } from "vuex";
 
 export default {

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue

@@ -41,7 +41,7 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import ClassicEditor from "ChillMainAssets/module/ckeditor5/editor_config";
 
 export default {
    name: "WriteComment",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

@@ -331,7 +331,7 @@
 import {mapState, mapGetters,} from 'vuex';
 import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
 import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -135,6 +135,8 @@
                          :filename="d.title"
                          :can-edit="true"
                          :execute-before-leave="submitBeforeLeaveToEditor"
+                         :davLink="d.storedObject._links?.dav_link.href"
+                         :davLinkExpiration="d.storedObject._links?.dav_link.expiration"
                          @on-stored-object-status-change="onStatusDocumentChanged"
                      ></document-action-buttons-group>
                    </li>
@@ -193,7 +195,7 @@
 <script>
 import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
 import { mapGetters, mapState } from 'vuex';
 import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue

@@ -75,7 +75,7 @@ div.participation-details {
 import { mapGetters } from 'vuex';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
 
 export default {
   name: 'MemberDetails',

src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue

@@ -10,7 +10,7 @@
 
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import ClassicEditor from "ChillMainAssets/module/ckeditor5/editor_config";
 
 export default {
   name: "PersonComment.vue",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts

@@ -15,7 +15,7 @@ const personMessages = {
       person: {
          firstname: "Prénom",
          lastname: "Nom",
-         born: (ctx) => {
+         born: (ctx: {gender: "man"|"woman"|"unknown"}) => {
           if (ctx.gender === 'man') {
             return 'Né le';
           } else if (ctx.gender === 'woman') {

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig

@@ -19,7 +19,6 @@
 <h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
 
 <div class="col-md col-xxl">
-        <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
 </div>
 {% endblock %}