Branch: refs/heads/stable-16.10.x Home: https://github.com/xwiki/xwiki-platform Commit: 7b1e79691ae4ac6bcd2f33a41a9b082b364803ad https://github.com/xwiki/xwiki-platform/commit/7b1e79691ae4ac6bcd2f33a41a9b0... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/po/RichTextAreaElement.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-test/xwiki-platform-ckeditor-test-pageobjects/src/main/java/org/xwiki/ckeditor/test/ui/AbstractCKEditorIT.java M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/ConfigSheet.xml M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/EditSheet.xml M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/edit.less M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/misc.less M xwiki-platform-core/xwiki-platform-netflux/xwiki-platform-netflux-api/src/main/resources/ApplicationResources.properties M xwiki-platform-core/xwiki-platform-realtime/pom.xml R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/main/java/org/xwiki/realtime/internal/DefaultRealtimeEditorManager.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/main/java/org/xwiki/realtime/internal/DefaultRealtimeSessionManager.java R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/main/java/org/xwiki/realtime/internal/RealtimeEditorManager.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/main/java/org/xwiki/realtime/internal/RealtimeSessionManager.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/main/java/org/xwiki/realtime/internal/XWikiRealtimeDocumentLockEditConfirmationChecker.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/main/resources/META-INF/components.txt R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/test/java/org/xwiki/realtime/internal/DefaultRealtimeEditorManagerTest.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/test/java/org/xwiki/realtime/internal/DefaultRealtimeSessionManagerTest.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-api/src/test/java/org/xwiki/realtime/internal/XWikiRealtimeDocumentLockEditConfirmationCheckerTest.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/pom.xml A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/Coeditor.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/CoeditorsDropdown.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/RealtimeEditToolbar.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/RealtimeInplaceEditablePage.java A xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/SaveStatus.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/ConfigurationClass.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/document.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/interface.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js 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 R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.css M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/userData.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-docker/src/test/it/org/xwiki/realtime/wiki/test/ui/RealtimeWikiEditorIT.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-test/xwiki-platform-realtime-wiki-test-pageobjects/src/main/java/org/xwiki/realtime/wiki/test/po/RealtimeWikiEditPage.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-ui/src/main/resources/XWiki/Realtime/WikiEditor.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/loader.js R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wiki/xwiki-platform-realtime-wiki-webjar/src/main/webjar/wikiEditor.css 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/RealtimeTestDebugger.java 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-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/pom.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditor.java R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeCKEditorToolBar.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeRichTextAreaElement.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-test/xwiki-platform-realtime-wysiwyg-test-pageobjects/src/main/java/org/xwiki/realtime/wysiwyg/test/po/RealtimeWYSIWYGEditPage.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.css 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-test/xwiki-platform-test-ui/src/main/java/org/xwiki/test/ui/TestUtils.java M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/changesinline.vm M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-war/src/main/webapp/resources/js/xwiki/actionbuttons/actionButtons.js Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Use round borders on some of the CKEditor UI to match the XWiki skin. * Use round borders on the form action toolbar. Also use a border when floating to separate it more clearly from the content underneath. * Make the Inplace edit mode look less like a form by removing the border from the title input and content area (when focused). * Use round border on the wiki editor. Also make the wiki editor toolbar buttons slightly larger. * Refactor the realtime edit confirmation checker to make it more clear that only a single realtime editing session per document is allowed without forcing the lock. * Remove the realtime editing administration section because its configuration options don't make sense anymore with the new realtime edit toolbar. * Implement the new realtime edit toolbar and use it for both WYSIWYG and Wiki edit modes. * Modify the realtime Netflux channel paths used by WYSIWYG and Wiki editors to be more REST-like. * Synchronize the Saver state immediately after a successful save is triggered (otherwise the content will appear as dirty after it was saved). * Refactor realtime test page objects. (cherry picked from commit d6cd1ead5802fcde6a83c36c87912b28d98145d5) Commit: e7b75d121773751cd9db25b74f7b2040d3083b08 https://github.com/xwiki/xwiki-platform/commit/e7b75d121773751cd9db25b74f7b2... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/RealtimeEditToolbar.java Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Fix JavaDoc (cherry picked from commit 62f7f8d89f9239cd5eb0bb30779dc2a194cebb8d) Commit: d7c63724347284ff01fbfca53da2a685798d9fb8 https://github.com/xwiki/xwiki-platform/commit/d7c63724347284ff01fbfca53da2a... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-ui/src/main/resources/CKEditor/InlineEditor.xml M xwiki-platform-core/xwiki-platform-edit/xwiki-platform-edit-ui/src/main/resources/XWiki/InplaceEditing.xml M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/less/type.less M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/toolbar.js Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Fix the Change Summary modal when editing in-place (fetching the changes was failing because the submitted form data was incomplete) * Fix the flickering on the document title when entering in-place edit mode * Remove the background-color from the title input when editing in-place * Place the caret at the start of the title input rather than selecting the entire document title, when entering in-place edit mode. (cherry picked from commit 90b4b9fe5b4818d0325afdcadb2f47773c96a783) Commit: 3b75e8e76cbc1cc61b08a8e2dcfff179996eb8be https://github.com/xwiki/xwiki-platform/commit/3b75e8e76cbc1cc61b08a8e2dcfff... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml 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-webjar/src/main/webjar/wysiwygEditor.js Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Bulletproof the recent versions dropdown. (cherry picked from commit 1dec7e3cd119ee351b5b32a4bbc5420ce5932977) Commit: ab603c4e6d97eb3ebea47a31b943ec6cbe6e152e https://github.com/xwiki/xwiki-platform/commit/ab603c4e6d97eb3ebea47a31b943e... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Fix some accessibility / webstandards errors. (cherry picked from commit 708b52661a18fd49d46f10ade0d6c5e34fccf379) Commit: f6312fa6df7e4af0f2ca939d95e01b17b5ee8880 https://github.com/xwiki/xwiki-platform/commit/f6312fa6df7e4af0f2ca939d95e01... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Fix webstandard tests (move inline styles to the stylesheet) (cherry picked from commit 259a4a997b72bffef44215beb64692c075268ced) Commit: 6fe6d5a952e448201e4071be471f09a7e66057d9 https://github.com/xwiki/xwiki-platform/commit/6fe6d5a952e448201e4071be471f0... Author: Marius Dumitru Florea <marius@xwiki.com> Date: 2025-04-08 (Tue, 08 Apr 2025) Changed paths: M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/plugin.js 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-test-pageobjects/src/main/java/org/xwiki/realtime/test/po/RealtimeEditToolbar.java M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/XWiki/Realtime/Configuration.xml M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/interface.js M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/loader.js 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-webjar/src/main/webjar/toolbar.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 Log Message: ----------- XWIKI-22780: Redesign the action buttons toolbar for the realtime WYSIWYG editor * Use a Bootstrap modal to ask for confirmation before leaving realtime collaboration. * Remove code duplication around "Allow realtime collaboration" checkbox. * Modify the auto-saver to ignore the states of disconnected users (e.g. when determining if the content is dirty) * Restore editable state when leaving realtime collaboration while disconnected. (cherry picked from commit 3fb34c260efcdad9af4cbc013ff4713e60891b4b) Compare: https://github.com/xwiki/xwiki-platform/compare/44bbdbd23d99...6fe6d5a952e4 To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications