Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable27] Roll back erroneous nextcloud/files update #43259

Merged
merged 5 commits into from Feb 3, 2024
Merged

[stable27] Roll back erroneous nextcloud/files update #43259

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eac66df
Revert "fix(trashbin) Switch parseWebdavPermissions->davParsePermissi…
marcelklehr Feb 1, 2024
31c5b47
Partially revert "fix(Users/Quota setting): Prevent floating point va…
marcelklehr Feb 1, 2024
3c2ba5b
Update package-lock.json
marcelklehr Feb 1, 2024
e79aded
Merge branch 'stable27' into fix/erroneous-nextcloud-files-update
marcelklehr Feb 3, 2024
9ab55c4
chore(assets): Recompile assets
nextcloud-command Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/files_trashbin/src/services/trashbin.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@
*/
/* eslint-disable */
import { getCurrentUser } from '@nextcloud/auth'
import { File, Folder, davParsePermissions } from '@nextcloud/files'
import { File, Folder, parseWebdavPermissions } from '@nextcloud/files'
import { generateRemoteUrl, generateUrl } from '@nextcloud/router'

import type { FileStat, ResponseDataDetailed } from 'webdav'
Expand Down Expand Up @@ -52,7 +52,7 @@ const data = `<?xml version="1.0"?>


const resultToNode = function(node: FileStat): File | Folder {
const permissions = davParsePermissions(node.props?.permissions)
const permissions = parseWebdavPermissions(node.props?.permissions)
const owner = getCurrentUser()?.uid as string
const previewUrl = generateUrl('/apps/files_trashbin/preview?fileId={fileid}&x=32&y=32', node.props)

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
"@nextcloud/capabilities": "^1.0.4",
"@nextcloud/dialogs": "^4.2.4",
"@nextcloud/event-bus": "^3.0.2",
"@nextcloud/files": "^3.0.0",
"@nextcloud/files": "^3.0.0-beta.8",
"@nextcloud/initial-state": "^2.0.0",
"@nextcloud/l10n": "^2.1.0",
"@nextcloud/logger": "^2.5.0",
Expand Down