Merge branch 'master' of framagit.org:/les/gancio into feat/geolocation_allow_to_change_providers_merge

components/admin/Settings.vue

@@ -39,6 +39,10 @@ v-container
       inset
       :label="$t('admin.allow_anon_event')")
 
+    v-switch.mt-1(v-model='allow_multidate_event'
+      inset
+      :label="$t('admin.allow_multidate_event')")
+
     v-switch.mt-1(v-model='allow_recurrent_event'
       inset
       :label="$t('admin.allow_recurrent_event')")
@@ -115,6 +119,10 @@ export default {
       get () { return this.settings.allow_recurrent_event },
       set (value) { this.setSetting({ key: 'allow_recurrent_event', value }) }
     },
+    allow_multidate_event: {
+      get () { return this.settings.allow_multidate_event },
+      set (value) { this.setSetting({ key: 'allow_multidate_event', value }) }
+    },
     recurrent_event_visible: {
       get () { return this.settings.recurrent_event_visible },
       set (value) { this.setSetting({ key: 'recurrent_event_visible', value }) }

components/admin/Theme.vue

@@ -16,6 +16,7 @@ v-container
       :label="$t('admin.hide_calendar')")
 
   v-card-title {{$t('admin.default_images')}}
+  v-card-subtitle(v-html="$t('admin.default_images_help')")
   v-card-text
     v-row
       v-col(cols='4')
@@ -109,12 +110,13 @@ import { mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp } from '@mdi/js'
 export default {
   name: 'Theme',
   data () {
+    const t = new Date().getMilliseconds()
     return {
       mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp,
       valid: false,
-      logoKey: 0,
-      fallbackImageKey: 0,
-      headerImageKey: 0,
+      logoKey: t,
+      fallbackImageKey: t,
+      headerImageKey: t,
       link: { href: '', label: '' },
       linkModal: false
       // menu: [false, false, false, false]