Merge pull request #7175 from owncloud/release-5.7.0

package.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.6.1",
+  "version": "5.7.0",
   "private": true,
   "homepage": "https://github.com/owncloud/web",
   "license": "AGPL-3.0",

packages/web-app-files/src/components/Shares/SharedWithMeSection.vue

@@ -103,6 +103,7 @@ import { ShareStatus } from 'web-client/src/helpers/share'
 import ContextActions from '../../components/FilesList/ContextActions.vue'
 import NoContentMessage from 'web-pkg/src/components/NoContentMessage.vue'
 import { useSelectedResources } from '../../composables/selection'
+import { SortDir } from '../../composables'
 
 const visibilityObserver = new VisibilityObserver()
 
@@ -135,11 +136,18 @@ export default defineComponent({
     },
     sortBy: {
       type: String,
-      required: true
+      required: false,
+      default: undefined
     },
     sortDir: {
       type: String,
-      required: true
+      required: false,
+      default: undefined,
+      validator: (value: string) => {
+        return (
+          value === undefined || [SortDir.Asc.toString(), SortDir.Desc.toString()].includes(value)
+        )
+      }
     },
     sortHandler: {
       type: Function,

packages/web-integration-oc10/appinfo/info.xml

@@ -15,7 +15,7 @@ For feedback and bug reports, please use the [public issue tracker](https://gith
 	</description>
 	<licence>AGPL</licence>
 	<author>ownCloud</author>
-	<version>5.6.1</version>
+	<version>5.7.0</version>
 	<category>tools</category>
 	<website>https://github.com/owncloud/web</website>
 	<bugs>https://github.com/owncloud/web/issues</bugs>

packages/web-integration-oc10/lib/Controller/SettingsController.php

@@ -72,12 +72,8 @@ public function __construct(
 	public function setWebDefaultConfig() {
 		$value = \filter_var($this->request->getParam('isDefault'), FILTER_VALIDATE_BOOLEAN);
 		$user = $this->userSession->getUser();
-		$configToSet = $value === true ? 'web' : null;
-		if (!$configToSet) {
-			$this->config->deleteUserValue($user->getUID(), 'core', 'defaultapp');
-		} else {
-			$this->config->setUserValue($user->getUID(), 'core', 'defaultapp', $configToSet);
-		}
+		$configToSet = $value === true ? 'web' : 'files';
+		$this->config->setUserValue($user->getUID(), 'core', 'defaultapp', $configToSet);
 
 		return new JSONResponse([]);
 	}

packages/web-runtime/src/defaults/index.ts

@@ -3,7 +3,7 @@ import merge from 'lodash-es/merge'
 import App from '../App.vue'
 import missingOrInvalidConfigPage from '../pages/missingOrInvalidConfig.vue'
 import Store from '../store'
-import { coreTranslations, odsTranslations } from './json'
+import { coreTranslations, clientTranslations, pkgTranslations, odsTranslations } from './json'
 import { createStore } from 'vuex-extensions'
 import Vuex from 'vuex'
 
@@ -15,7 +15,13 @@ export { default as DesignSystem } from 'owncloud-design-system'
 
 export const store = createStore(Vuex.Store, { ...Store })
 export const pages = { success: App, failure: missingOrInvalidConfigPage }
-export const translations = merge({}, coreTranslations, odsTranslations)
+export const translations = merge(
+  {},
+  coreTranslations,
+  clientTranslations,
+  pkgTranslations,
+  odsTranslations
+)
 export const supportedLanguages = {
   en: 'English',
   de: 'Deutsch',

packages/web-runtime/src/defaults/json.js

@@ -3,7 +3,11 @@
  * as workaround export it from a js file
  */
 import CoreTranslations from '../../l10n/translations.json'
+import ClientTranslations from 'web-client/l10n/translations.json'
+import PkgTranslations from 'web-pkg/l10n/translations.json'
 import OdsTranslations from 'owncloud-design-system/dist/system/translations.json'
 
 export const coreTranslations = CoreTranslations
+export const clientTranslations = ClientTranslations
+export const pkgTranslations = PkgTranslations
 export const odsTranslations = OdsTranslations

sonar-project.properties

@@ -2,7 +2,7 @@
 sonar.projectKey=owncloud_web
 sonar.organization=owncloud-1
 sonar.projectName=Web
-sonar.projectVersion=5.6.1
+sonar.projectVersion=5.7.0
 sonar.host.url=https://sonarcloud.io
 
 # =====================================================

tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md

@@ -279,7 +279,7 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [webUIFilesDetails/fileDetails.feature:70](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L70)
 -   [webUIRenameFiles/renameFiles.feature:257](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L257)
 
-### [Copy/move not possible from and into shares in oCIS](https://github.com/owncloud/web/issues/6892) 
+### [Copy/move not possible from and into shares in oCIS](https://github.com/owncloud/web/issues/6892)
 -   [webUIFilesCopy/copy.feature:89](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L89)
 -   [webUIFilesCopy/copy.feature:101](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesCopy/copy.feature#L101)