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

[stable27] fix: handle non markdown files in conflicts #4272

Merged
merged 5 commits into from
Aug 17, 2023
Merged

[stable27] fix: handle non markdown files in conflicts #4272

merged 5 commits into from
Aug 17, 2023

Commits on Aug 17, 2023

  1. fix: handle non markdown files in conflicts 

    Do not parse non markdown files when resetting the content.

Fixes #4205.

Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    bab8451 View commit details
    Browse the repository at this point in the history

  2. cleanup: scoped rule for element that is out of scope 

    Both the `.text-editor__main` and the `#read-only-editor`
are not part of the Editor component that the style is scoped for.

Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    a65a7b4 View commit details
    Browse the repository at this point in the history

  3. fix(css): default background for server version 

    Text files are rendered as code blocks.
Do not apply the prosemirror style to keep the background color.

Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    0933eef View commit details
    Browse the repository at this point in the history

  4. test(cypress): conflict handling with plain text files 

    Signed-off-by: Max <max@nextcloud.com>
    @max-nextcloud
    max-nextcloud committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    36b2622 View commit details
    Browse the repository at this point in the history

  5. chore(assets): Recompile assets 

    Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
    @nextcloud-command
    nextcloud-command committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    0895c85 View commit details
    Browse the repository at this point in the history