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

[stable21] Fix federated scope not shown when public addressbook upload is disabled #29384

Merged
merged 3 commits into from
Nov 3, 2021
Merged

[stable21] Fix federated scope not shown when public addressbook upload is disabled #29384

merged 3 commits into from
Nov 3, 2021

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #26725

@danxuliu @backportbot
Add missing scope to test
c628411 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu @backportbot
Fix "Federated" scope not shown when the lookup server is disabled
7e12517 
When the lookup server is disabled the address books can still be
exchanged between trusted servers. Therefore the user should be able to
set the "Federated" scope in that case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@danxuliu @backportbot
Hide "federated" scope when Federation app is disabled
46290e9 
If the Federation app is disabled it is not possible to synchronize the
users from a different server.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 21.0.6 milestone Oct 22, 2021
danxuliu
danxuliu reviewed Oct 22, 2021
View reviewed changes
Copy link
Member

@danxuliu danxuliu left a comment

Choose a reason for hiding this comment

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

Tested and works 👍

However, note that a capability is split, so I guess that would require to be adjusted in the clients too. Should the commit that splits the capability be dropped here and only used for NC 23?

@skjnldsv
Copy link
Member

Should the commit that splits the capability be dropped here and only used for NC 23?

I guess so yes 👍

@skjnldsv skjnldsv added the 3. to review Waiting for reviews label Oct 25, 2021
@danxuliu danxuliu force-pushed the backport/26725/stable21 branch from aec1c0c to 46290e9 Compare November 3, 2021 05:40
@danxuliu
Copy link
Member

danxuliu commented Nov 3, 2021 •
edited
Loading

Should the commit that splits the capability be dropped here and only used for NC 23?

I guess so yes 👍

Force pushed to drop the last commit.

@skjnldsv skjnldsv merged commit d87894a into stable21 Nov 3, 2021
@skjnldsv skjnldsv deleted the backport/26725/stable21 branch November 3, 2021 09:17
@blizzz blizzz mentioned this pull request Nov 3, 2021
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@danxuliu danxuliu danxuliu left review comments

@MichaIng MichaIng MichaIng approved these changes

@skjnldsv skjnldsv skjnldsv approved these changes

@juliusknorr juliusknorr Awaiting requested review from juliusknorr

@kesselb kesselb Awaiting requested review from kesselb

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@PVince81 PVince81 Awaiting requested review from PVince81

@Pytal Pytal Awaiting requested review from Pytal

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: settings regression
Projects
None yet
Milestone
Nextcloud 21.0.6
Development

Successfully merging this pull request may close these issues.
3 participants
@skjnldsv @danxuliu @MichaIng