[stable21] Fix federated scope not shown when public addressbook upload is disabled#29384
Merged
[stable21] Fix federated scope not shown when public addressbook upload is disabled#29384
Conversation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
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>
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>
danxuliu
reviewed
Oct 22, 2021
Member
danxuliu
left a comment
There was a problem hiding this comment.
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?
MichaIng
approved these changes
Oct 23, 2021
skjnldsv
approved these changes
Oct 25, 2021
Member
I guess so yes 👍 |
aec1c0c to
46290e9
Compare
Member
Force pushed to drop the last commit. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport of #26725