Branch: refs/heads/stable-16.4.x Home: https://github.com/xwiki/xwiki-platform Commit: 8c3ddd836ad3534256184723586853272af8f2bc https://github.com/xwiki/xwiki-platform/commit/8c3ddd836ad35342561847235868… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-04 (Fri, 04 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-filter/plugin.js M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-test/xwiki-platform-edit-test-pageobjects/src/main/java/org/xwiki/edit/test/po/InplaceEditablePage.java M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources.properties M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/messages.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/actionbuttons/actionButtons.js M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/meta.js Log Message: ----------- 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 62264aed58e3756d15649cafd4aface92a43c38e) Commit: e7b5ecaba418b56d1c684aaf061a61369e3dda9d https://github.com/xwiki/xwiki-platform/commit/e7b5ecaba418b56d1c684aaf061a… Author: Marius Dumitru Florea <marius(a)xwiki.com> Date: 2024-10-04 (Fri, 04 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-save/plugin.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-docker/src/test/it/org/xwiki/realtime/wysiwyg/test/ui/RealtimeWYSIWYGEditorIT.java Log Message: ----------- XWIKI-22224: Sometimes when the automatically Saved is done the Menu bar dissapears (cherry picked from commit eb581d422a84220099d734172032b0b4dd305003) Compare: https://github.com/xwiki/xwiki-platform/compare/9f903ee0679a...e7b5ecaba418 To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications