-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
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.
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
Fix invite guest for new sharing flow #40389
Conversation
901f95f
to
0f94c99
Compare
0f94c99
to
3d3fa76
Compare
/compile amend / |
Important point here is the backport then, which from what I understood will differ from the main branch one. |
3d3fa76
to
7474a9b
Compare
/backport to stable27 |
I did this on stable27 and realized it would work on master so decide to send the PR here at once, would backport to stable27 from this. (If your comment is related to this) |
conflicts and red cypress |
0ec31ed
to
00fdea4
Compare
/compile amend / |
00fdea4
to
171b921
Compare
/compile amend / |
171b921
to
6257c51
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested and works
6257c51
to
419eb0d
Compare
Rebased |
419eb0d
to
694f990
Compare
Call external handlers such as the one in the guess app https://github.com/nextcloud/guests/blob/master/src/main.js#L30 if present. Signed-off-by: fenn-cs <[email protected]>
694f990
to
1f74c88
Compare
/compile amend / |
1f74c88
to
7b0099f
Compare
7b0099f
to
d3f2212
Compare
/compile amend / |
This commit will need to be backported as well, as the rest is already merged into stable27 |
Exactly! already did :) |
d3f2212
to
84609d6
Compare
25a4037
to
7c4248f
Compare
/compile amend / |
SharingEntryLink and regular ShareEntry were not properly visually aligned before this commit. Signed-off-by: fenn-cs <[email protected]> Signed-off-by: nextcloud-command <[email protected]>
7c4248f
to
2755976
Compare
The backport to stable27 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable27
git pull origin stable27
# Create the new backport branch
git checkout -b fix/foo-stable27
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27 More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
It went in via this backport : #40415 thanks to @artonge the only thing that didn't go with that is the alignment commit which is non critical and is already back-ported now too. cc: @AndyScherzinger |
The backport et alignment we will probably need to dig in a bit deeper so it is also aligned with related resources (if present). So I expect the alignment will see a further small update. Do you happen to have a screenshot with shares and related resources? |
Resolves : #40172
Resolves : #40299