Merge remote-tracking branch 'origin/develop' into migrate/vuex-to-pinia

src/modules/config.js

@@ -36,8 +36,6 @@ export const multiChoiceProperties = [
   'unsavedPostAction' // save | discard | confirm
 ]
 
-console.log('TEST', defaultState)
-
 // caching the instance default properties
 export const instanceDefaultProperties = Object.entries(defaultState)
   .filter(([key, value]) => value === undefined)

src/modules/default_config_state.js

@@ -160,5 +160,6 @@ export const defaultState = {
   useAbsoluteTimeFormat: undefined, // instance default
   absoluteTimeFormatMinAge: undefined, // instance default
   absoluteTime12h: undefined, // instance default
-  imageCompression: true
+  imageCompression: true,
+  alwaysUseJpeg: false
 }

src/modules/serverSideStorage.js

@@ -125,6 +125,7 @@ export const _getRecentData = (cache, live, isTest) => {
   }
 
   const merge = (a, b) => ({
+    _user: a._user ?? b._user,
     _version: a._version ?? b._version,
     _timestamp: a._timestamp ?? b._timestamp,
     needUpload: b.needUpload ?? a.needUpload,