Merge remote-tracking branch 'origin/update-scaffold' into update-scaffold

Author: ricardovanlaarhoven

generator/templates/Authorisation/src/locales/nl/authorisation.json

@@ -33,6 +33,6 @@
     "actions": {
         "login": "Inloggen",
         "passwordForgotten": "Wachtwoord vergeten",
-        "logOff": "Uitloggen"
+        "logout": "Uitloggen"
     }
 }

generator/templates/Authorisation/src/views/authorisation/InvitationAccept.vue

@@ -1,5 +1,4 @@
 <template>
-
   <v-row align="stretch" justify-md="center">
     <v-col md="3">
       <v-form @submit.prevent="handleAccept()" ref="form" v-model="isValid">

generator/templates/Default/src/components/crud/fields/KDateField.vue

@@ -38,7 +38,7 @@
 
 <script>
 import Field from '@/components/crud/fields/FieldMixin.vue';
-import dayjs from 'dayjs';
+import dayjs from '@/plugins/dayjs';
 
 export default {
   name: 'KDateField',
@@ -93,4 +93,3 @@ export default {
   },
 };
 </script>
-

generator/templates/Default/src/components/crud/fields/KTimeField.vue

@@ -43,7 +43,7 @@
 
 <script>
 import Field from '@/components/crud/fields/FieldMixin.vue';
-import dayjs from 'dayjs';
+import dayjs from '@/plugins/dayjs';
 
 export default {
   name: 'KTimeField',