Skip to content

[stable24] DirectEditing: Set session user for DirectSession editing - #3372

Merged
juliusknorr merged 2 commits into
stable24from
backport/3356/stable24
Nov 7, 2022
Merged

[stable24] DirectEditing: Set session user for DirectSession editing#3372
juliusknorr merged 2 commits into
stable24from
backport/3356/stable24

Conversation

@backportbot-nextcloud

@backportbot-nextcloudbackportbot-nextcloudBot commented Nov 7, 2022

Copy link
Copy Markdown
  • ⚠️ This backport had conflicts and is incomplete

backport of #3356

@backportbot-nextcloudbackportbot-nextcloudBot added the bug Something isn't working label Nov 7, 2022
@backportbot-nextcloudbackportbot-nextcloudBot added this to the Nextcloud 24.0.8 milestone Nov 7, 2022

@juliusknorrjuliusknorr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🙈 Conflicts

@cypress

cypressBot commented Nov 7, 2022

Copy link
Copy Markdown



Test summary

52000


Run details

ProjectText
StatusPassed
Commitf208638ℹ️
StartedNov 7, 2022 1:41 PM
EndedNov 7, 2022 1:45 PM
Duration03:16 💡
OSLinux Ubuntu - 20.04
BrowserElectron 100

View run in Cypress Dashboard ➡️


This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@max-nextcloud

max-nextcloud commented Nov 7, 2022

Copy link
Copy Markdown
Collaborator

@juliushaertl I also backported your older commit that changed the underlying code. It only cleans things up and adds types... so should be fine to backport. Also reduces the diff for future backports.

update: looks like the linter is still unhappy. Will need to fix separately.

@max-nextcloud
max-nextcloud requested review from juliusknorr and removed request for marcelklehr and max-nextcloudNovember 7, 2022 13:22
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Comment threadlib/Controller/DirectSessionController.php Outdated
to have it available for the file put activities event
fixesnextcloud/android#10237fixes#2821
Signed-off-by: Marcel Klehr <mklehr@gmx.net>
@juliusknorr
juliusknorr merged commit f754105 into stable24Nov 7, 2022
@juliusknorr
juliusknorr deleted the backport/3356/stable24 branch November 7, 2022 16:15
@max-nextcloud

Copy link
Copy Markdown
Collaborator

/backport to stable23

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewbugSomething isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@max-nextcloud@marcelklehr@juliusknorr