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.

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

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

Merged
merged 3 commits into from Nov 3, 2021

Commits on Oct 22, 2021

  1. Add missing scope to test

    Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
    danxuliu authored and backportbot[bot] committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    c628411 View commit details
    Browse the repository at this point in the history
  2. Fix "Federated" scope not shown when the lookup server is disabled

    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 authored and backportbot[bot] committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    7e12517 View commit details
    Browse the repository at this point in the history
  3. Hide "federated" scope when Federation app is disabled

    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 authored and backportbot[bot] committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    46290e9 View commit details
    Browse the repository at this point in the history