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,

server/helpers.js

@@ -80,6 +80,7 @@ module.exports = {
       allow_registration: settings.allow_registration,
       allow_anon_event: settings.allow_anon_event,
       allow_recurrent_event: settings.allow_recurrent_event,
+      allow_multidate_event: settings.allow_multidate_event,
       recurrent_event_visible: settings.recurrent_event_visible,
       enable_federation: settings.enable_federation,
       enable_resources: settings.enable_resources,
@@ -125,7 +126,7 @@ module.exports = {
 
     router.use('/fallbackimage.png', (req, res, next) => {
       const fallbackImagePath =  settingsController.settings.fallback_image || './static/noimg.svg'
-      return express.static(fallbackImagePath, { maxAge: '1d' })(req, res, next)
+      return express.static(fallbackImagePath)(req, res, next)
     })
 
     router.use('/headerimage.png', (req, res, next) => {
@@ -135,12 +136,12 @@ module.exports = {
 
     router.use('/logo.png', (req, res, next) => {
       const logoPath = settingsController.settings.logo || './static/gancio'
-      return express.static(logoPath + '.png', {maxAge: '1d'})(req, res, next)
+      return express.static(logoPath + '.png')(req, res, next)
     })
 
     router.use('/favicon.ico', (req, res, next) => {
       const faviconPath = res.locals.settings.logo ? res.locals.settings.logo + '.png' : './assets/favicon.ico'
-      return express.static(faviconPath, {maxAge: '1d'})(req, res, next)
+      return express.static(faviconPath)(req, res, next)
     })
 
     return router