Code

[stable26] Conflict fixes#3988

Code

Merged

mejo- merged 8 commits intostable26nextcloud/text:stable26from backport/3972/stable26nextcloud/text:backport/3972/stable26Copy head branch name to clipboardMar 29, 2023

+157-64

Commits

Commits on Mar 29, 2023

• test: Add cypress tests for resolving conflicts

  Show description for 6c0589e
  

  juliusknorr

  authored and

  mejo-

  committed
  6c0589e

• fix: store actually used mtime

  Show description for 504ea27
  

  juliusknorr

  authored and

  mejo-

  committed
  504ea27

• fix: Properly restart sync after conflict resolution

  Show description for 55a1633
  

  juliusknorr

  authored and

  mejo-

  committed
  55a1633

• fix: Avoid writing file content if it has not changed

  Show description for dd2f7c5
  

  juliusknorr

  authored and

  mejo-

  committed
  dd2f7c5

• fix: Fix styling of collission dialog and move it out of the editor

  Show description for eb36c1e
  

  juliusknorr

  authored and

  mejo-

  committed
  eb36c1e

• fix: Do not disconnect during conflict to be able to catch up on a resolution

  Show description for c56586b
  

  juliusknorr

  authored and

  mejo-

  committed
  c56586b

• Use max-height in DocumentStatus, fixes empty 50px bar above toolbar

  Show description for 5ed2a21
  mejo-

  committed
  5ed2a21

• Compile assets

  Show description for 351cee2
  nextcloud-command

  committed
  351cee2