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

[stable23] DirectEditing: Set session user for DirectSession editing #3373

Merged
merged 4 commits into from
Nov 9, 2022
Merged

[stable23] DirectEditing: Set session user for DirectSession editing #3373

merged 4 commits into from
Nov 9, 2022

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Nov 7, 2022 •
edited by marcelklehr
Loading

  • ⚠️ This backport had conflicts and is incomplete

backport of #3356

@backportbot-nextcloud backportbot-nextcloud bot added the bug Something isn't working label Nov 7, 2022
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 23.0.12 milestone Nov 7, 2022
juliushaertl
juliushaertl previously requested changes Nov 7, 2022
View reviewed changes
Copy link
Member

@juliushaertl juliushaertl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙈 Conflicts

max-nextcloud
max-nextcloud reviewed Nov 7, 2022
View reviewed changes
Copy link
Collaborator

@max-nextcloud max-nextcloud left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The $share definition still needs to be removed i think. Might remove shareManager at the same time.

marcelklehr and others added 4 commits November 9, 2022 10:05
@marcelklehr @max-nextcloud
DirectEditing: Set session user for DirectSession editing
0ebec63 
to have it available for the file put activities event

fixes nextcloud/android#10237
fixes #2821

Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr @max-nextcloud
Fix lint errors
6edfb3a 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@marcelklehr @max-nextcloud
Repair after conflict
28e816f 
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@max-nextcloud
cleanup: unused $share and $shareManager in DirectSessionController
8934cc2 
Signed-off-by: Max <max@nextcloud.com>
@max-nextcloud max-nextcloud dismissed juliushaertl’s stale review November 9, 2022 09:28

The conflicts are fixed now.

@max-nextcloud max-nextcloud merged commit 4f125ae into stable23 Nov 9, 2022
@delete-merged-branch delete-merged-branch bot deleted the backport/3356/stable23 branch November 9, 2022 09:28
@blizzz blizzz mentioned this pull request Nov 21, 2022
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@max-nextcloud max-nextcloud max-nextcloud approved these changes

@marcelklehr marcelklehr Awaiting requested review from marcelklehr

@juliushaertl juliushaertl Awaiting requested review from juliushaertl

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
Nextcloud 23.0.12
Development

Successfully merging this pull request may close these issues.
3 participants
@juliushaertl @max-nextcloud @marcelklehr