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

[stable29] No conflict dialogue in read only #6096

Merged
merged 5 commits into from
Jul 24, 2024
Merged

[stable29] No conflict dialogue in read only #6096

merged 5 commits into from
Jul 24, 2024

Commits on Jul 24, 2024

  1. test(cy): extract createConflict function 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud @backportbot
    max-nextcloud authored and backportbot[bot] committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    3659da9 View commit details
    Browse the repository at this point in the history

  2. fix(listeners): clean up sessions for plaintext as well 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud @backportbot
    max-nextcloud authored and backportbot[bot] committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    6b329c7 View commit details
    Browse the repository at this point in the history

  3. fix(conflict): no conflict dialogue in read only mode 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud @backportbot
    max-nextcloud authored and backportbot[bot] committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    2271df7 View commit details
    Browse the repository at this point in the history

  4. test(cy): use cy.getContent and more compact syntax 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud @backportbot
    max-nextcloud authored and backportbot[bot] committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    587e535 View commit details
    Browse the repository at this point in the history

  5. fix: Remove superfluous import 

    Signed-off-by: Jonas <jonas@freesources.org>
    @mejo-
    mejo- committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    b25dc0a View commit details
    Browse the repository at this point in the history