Skip to content
Snippets Groups Projects
  1. Oct 18, 2024
  2. Oct 16, 2024
  3. Oct 10, 2024
  4. Oct 09, 2024
  5. Oct 08, 2024
  6. Oct 04, 2024
    • Marius Dumitru Florea's avatar
    • Marius Dumitru Florea's avatar
      XWIKI-22351: The autosave triggers a merge conflict sometimes even if there's... · ac0556e0
      Marius Dumitru Florea authored
      XWIKI-22351: The autosave triggers a merge conflict sometimes even if there's no save done outside the realtime session
      * When replacing empty paragraphs with empty lines, take into account the CKEditor temporary elements (like the hidden selection) when determining if an empty paragraph is at the start / end of the edited content, otherwise we get conflicts in the realtime session (e.g. because the widget selection is not synchronized and so some users will have the hidden selection element while others won't)
      * Disable the action buttons while an action takes place (e.g. saving) in order to avoid triggering the same action multiple times
      * Rewrite the realtime auto-saver to improve the synchronization between clients when saving or handling merge conflicts
      
      (cherry picked from commit 62264aed)
      ac0556e0
  7. Sep 30, 2024
  8. Sep 27, 2024
  9. Sep 26, 2024
  10. Sep 18, 2024
  11. Sep 17, 2024
  12. Sep 16, 2024
  13. Sep 14, 2024
  14. Sep 13, 2024
  15. Sep 12, 2024
Loading