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

server/api/controller/export.js

@@ -88,6 +88,7 @@ const exportController = {
       const start = tmpStart.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
       const end = tmpEnd.utc(true).format('YYYY-M-D-H-m').split('-').map(Number)
       return {
+        uid: `${e.id}@${settings.hostname}`,
         start,
         end,
         title: `[${settings.title}] ${e.title}`,

server/api/controller/settings.js

@@ -27,6 +27,7 @@ const defaultSettings = {
   instance_place: '',
   allow_registration: true,
   allow_anon_event: true,
+  allow_multidate_event: true,
   allow_recurrent_event: false,
   recurrent_event_visible: false,
   allow_geolocation: true,