owncloud · pascalwengerter · May 12, 2021 · May 10, 2021 · May 10, 2021 · May 11, 2021
diff --git a/.../unreleased/bugfix-editors-for-all-routes → ..._2021-05-12/bugfix-editors-for-all-routes b/.../unreleased/bugfix-editors-for-all-routes → ..._2021-05-12/bugfix-editors-for-all-routes
diff --git a/...g/unreleased/bugfix-improve-web-container → ...0_2021-05-12/bugfix-improve-web-container b/...g/unreleased/bugfix-improve-web-container → ...0_2021-05-12/bugfix-improve-web-container
diff --git a/...leased/bugfix-navigation-in-private-links → ...-05-12/bugfix-navigation-in-private-links b/...leased/bugfix-navigation-in-private-links → ...-05-12/bugfix-navigation-in-private-links
diff --git a/...g/unreleased/bugfix-new-file-menu-z-index → ...0_2021-05-12/bugfix-new-file-menu-z-index b/...g/unreleased/bugfix-new-file-menu-z-index → ...0_2021-05-12/bugfix-new-file-menu-z-index
diff --git a/...ed/enhancement-accessibility-improvements → ...12/enhancement-accessibility-improvements b/...ed/enhancement-accessibility-improvements → ...12/enhancement-accessibility-improvements
@@ -7,7 +7,8 @@ A lot of random changes:
 - Make skip-to-main button translate-able
 - Update searchbar label string
 - Renamed "personal files" to "all files" in routes (soft rename, due to changes in the future)
-- Updated ODS to v5.1.0
+- Updated ODS to v6.0.3, making row heights theme-able and bringing a more accessible avatar component that improves loading of users' profile pictures
 
 https://github.com/owncloud/web/pull/4965
 https://github.com/owncloud/web/pull/4975
+https://github.com/owncloud/web/pull/5098
diff --git a/...elog/unreleased/enhancement-direct-delete → ....1.0_2021-05-12/enhancement-direct-delete b/...elog/unreleased/enhancement-direct-delete → ....1.0_2021-05-12/enhancement-direct-delete
diff --git a/.../enhancement-enable-toggleable-search-bar → .../enhancement-enable-toggleable-search-bar b/.../enhancement-enable-toggleable-search-bar → .../enhancement-enable-toggleable-search-bar
diff --git a/...g/unreleased/enhancement-extension-config → ...0_2021-05-12/enhancement-extension-config b/...g/unreleased/enhancement-extension-config → ...0_2021-05-12/enhancement-extension-config
diff --git a/...g/unreleased/enhancement-focus-management → ...0_2021-05-12/enhancement-focus-management b/...g/unreleased/enhancement-focus-management → ...0_2021-05-12/enhancement-focus-management
diff --git a/changelog/unreleased/enhancement-h-tags → ...gelog/3.1.0_2021-05-12/enhancement-h-tags b/changelog/unreleased/enhancement-h-tags → ...gelog/3.1.0_2021-05-12/enhancement-h-tags
diff --git a/...ased/enhancement-lazy-file-avatar-loading → ...5-12/enhancement-lazy-file-avatar-loading b/...ased/enhancement-lazy-file-avatar-loading → ...5-12/enhancement-lazy-file-avatar-loading
diff --git a/changelog/unreleased/enhancement-people-list → .../3.1.0_2021-05-12/enhancement-people-list b/changelog/unreleased/enhancement-people-list → .../3.1.0_2021-05-12/enhancement-people-list
diff --git a/...ed/enhancement-real-location-picker-title → ...12/enhancement-real-location-picker-title b/...ed/enhancement-real-location-picker-title → ...12/enhancement-real-location-picker-title
diff --git a/...unreleased/enhancement-show-search-button → ...2021-05-12/enhancement-show-search-button b/...unreleased/enhancement-show-search-button → ...2021-05-12/enhancement-show-search-button
diff --git a/docs/theming/_index.md b/docs/theming/_index.md
@@ -260,7 +260,7 @@ An empty template for your custom theme is provided below, and you can use the i
         "large": "",
         "medium": ""
       },
-      "size": {
+      "sizes": {
         "form-check-default": "",
         "height-small": "",
         "icon-default": "",

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.0.0",
+  "version": "3.1.0",
   "private": true,
   "homepage": "https://github.com/owncloud/web",
   "license": "AGPL-3.0",

diff --git a/packages/web-integration-oc10/appinfo/info.xml b/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>3.0.0</version>
+	<version>3.1.0</version>
 	<category>tools</category>
 	<website>https://github.com/owncloud/web</website>
 	<bugs>https://github.com/owncloud/web/issues</bugs>

diff --git a/packages/web-runtime/.depcheckrc b/packages/web-runtime/.depcheckrc
@@ -4,10 +4,9 @@
     "easygettext",
     "luxon",
     "uikit",
-    "vue-avatar",
     "vue-datetime",
     "webfontloader",
     "weekstart",
     "vue-inline-svg"
   ]
-}
+}
diff --git a/packages/web-runtime/package.json b/packages/web-runtime/package.json
@@ -12,13 +12,12 @@
     "luxon": "^1.22.0",
     "moment": "^2.24.0",
     "oidc-client": "1.10.1",
-    "owncloud-design-system": "^6.0.1",
+    "owncloud-design-system": "6.0.3",
     "owncloud-sdk": "^1.0.0-740",
     "p-queue": "^6.1.1",
     "tus-js-client": "^1.8.0",
     "uikit": "3.5.16",
     "vue": "^2.6.10",
-    "vue-avatar": "^2.2.0",
     "vue-clipboard2": "^0.3.1",
     "vue-datetime": "^1.0.0-beta.10",
     "vue-drag-drop": "^1.1.4",

diff --git a/tests/acceptance/pageObjects/sharedWithMePage.js b/tests/acceptance/pageObjects/sharedWithMePage.js
@@ -108,14 +108,14 @@ module.exports = {
     },
     getSharedFromUserName: {
       selector:
-        '//td[contains(@class,"oc-table-data-cell-owner")]//div[@aria-label=normalize-space("%s")]',
+        '//td[contains(@class,"oc-table-data-cell-owner")]//span[@aria-label=normalize-space("%s")]',
       locateStrategy: 'xpath'
     },
     sharedFrom: {
       // ugly hack: oc-avatar has a parent div.oc-avatar-group, which is also matched by `contains(@class, 'oc-avatar')`.
       // to solve this we try matching on the class surrounded by blanks, which is not matching the oc-avatar-group anymore.
       selector:
-        "//td[contains(@class,'oc-table-data-cell-owner')]//div[contains(concat(' ', normalize-space(@class), ' '), ' oc-avatar ')]",
+        "//td[contains(@class,'oc-table-data-cell-owner')]//span[contains(concat(' ', normalize-space(@class), ' '), ' oc-avatar ')]",
       locateStrategy: 'xpath'
     },
     shareStatusActionOnFileRow: {

diff --git a/tests/acceptance/pageObjects/sharedWithOthersPage.js b/tests/acceptance/pageObjects/sharedWithOthersPage.js
@@ -39,7 +39,7 @@ module.exports = {
   },
   elements: {
     collaboratorsInFileRow: {
-      selector: '//div[contains(@class, "oc-table-files-people")]//div',
+      selector: '//div[contains(@class, "oc-table-files-people")]//*[self::span or self::div]',
       locateStrategy: 'xpath'
     }
   }

diff --git a/tests/vrt/baseline/oc10/topBar.png b/tests/vrt/baseline/oc10/topBar.png
diff --git a/yarn.lock b/yarn.lock
@@ -7613,10 +7613,10 @@ ospec@3.1.0:
   dependencies:
     glob "^7.1.3"
 
-owncloud-design-system@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-6.0.1.tgz#bfa8a797fd35b38d320ec7e8e74683c9dd1278be"
-  integrity sha512-nLcXRMYdcX7UDS3UkWim7urLOx00u2VUP+01SSpeN5Liuufh8UR88ENLIRW+fqcIPPGhu15qlr1JsV5+0MDgEA==
+owncloud-design-system@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/owncloud-design-system/-/owncloud-design-system-6.0.3.tgz#c7cf5f4e9095120dce139ef52302f0114187dbb2"
+  integrity sha512-6iKYU0aq1Beei8W58TOOWUf/ekUSgdz5gy1yM4lHw/kPSC+fkXu7YWS53h2RjgPOZRP8PdqPxHE9oMqnBd9fnw==
 
 owncloud-sdk@^1.0.0-740:
   version "1.0.0-1716"
@@ -10678,11 +10678,6 @@ void-elements@^3.1.0:
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
   integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
 
-vue-avatar@^2.2.0:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-avatar/-/vue-avatar-2.3.3.tgz#e125bf4f4a6f4f9480da0c522020266a8609d2a8"
-  integrity sha512-Z57ILRTkFIAuCH9JiFBxX74C5zua5ub/jRDM/KZ+QKXNfscvmUOgWBs3kA2+wrpZMowIvfLHIT0gvQu1z+zpLg==
-
 vue-clipboard2@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz#6e551fb7bd384889b28b0da3b12289ed6bca4894"