- notifications - lists.xwiki.org

[jira@xwiki.org][Issue] Updates for TESTREPORT-44: This is a test
by XWiki Notifications 04 Oct '24

04 Oct '24

1 0

[jira@xwiki.org][Issue] Updates for XRENDERING-757: Move Doxia based modules to contrib
by XWiki Notifications 04 Oct '24

04 Oct '24

1 0

[xwiki/xwiki-rendering] 275b5d: XRENDERING-757: Move Doxia based modules to contrib
by XWiki Notifications 04 Oct '24

04 Oct '24

Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-rendering Commit: 275b5d70cc7ac340393bebda98eb9ee78c17e38c https://github.com/xwiki/xwiki-rendering/commit/275b5d70cc7ac340393bebda98e… Author: Thomas Mortagne <thomas.mortagne(a)gmail.com> Date: 2024-10-04 (Fri, 04 Oct 2024) Changed paths: M xwiki-rendering-syntaxes/pom.xml R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/pom.xml R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/java/org/xwiki/rendering/internal/apt/APT10SyntaxProvider.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/java/org/xwiki/rendering/internal/parser/apt/APTParser.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/java/org/xwiki/rendering/internal/renderer/apt/APTBlockRenderer.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/java/org/xwiki/rendering/internal/renderer/apt/APTRenderer.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/java/org/xwiki/rendering/internal/renderer/apt/APTRendererFactory.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/java/org/xwiki/rendering/internal/renderer/apt/XWikiAPTSink.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/main/resources/META-INF/components.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/java/org/xwiki/rendering/internal/apt/APT10SyntaxProviderTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/java/org/xwiki/rendering/internal/apt/APTCompatibilityTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/config.properties R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/bold/bold1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/bold/bold1.out.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/bold/bold2.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/bold/bold2.out.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/bold/bold3.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/italic/italic1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/italic/italic1.out.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/list/list1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/list/list1.out.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/monospace/monospace1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/monospace/monospace1.out.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/paragraph/paragraph1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/section/section1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/symbol/symbol1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/table/table1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/table/table1.out.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-apt/src/test/resources/apt10/simple/verbatim/verbatim2.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/pom.xml R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/java/org/xwiki/rendering/internal/docbook/Docbook44SyntaxProvider.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/java/org/xwiki/rendering/internal/parser/docbook/DocBookParser.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/java/org/xwiki/rendering/internal/renderer/docbook/DocBookBlockRenderer.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/java/org/xwiki/rendering/internal/renderer/docbook/DocBookRenderer.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/java/org/xwiki/rendering/internal/renderer/docbook/DocBookRendererFactory.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/java/org/xwiki/rendering/internal/renderer/docbook/XWikiDocBookSink.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/main/resources/META-INF/components.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/java/org/xwiki/rendering/internal/docbook/DocBookCompatibilityTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/java/org/xwiki/rendering/internal/docbook/DocBookParserTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/java/org/xwiki/rendering/internal/docbook/Docbook44SyntaxProviderTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook/example.xml R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook/expected.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/config.properties R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/bold/bold1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/bold/bold2.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/bold/bold3.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/italic/italic1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/list/list1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/paragraph/paragraph1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/section/section1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/table/table1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/verbatim/verbatim1.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-docbook/src/test/resources/docbook44/simple/verbatim/verbatim2.inout.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/pom.xml R xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/AbstractDoxiaParser.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/parser/doxia/XWikiGeneratorSink.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/renderer/doxia/DoxiaListener.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/renderer/doxia/DoxiaPrinterAdapter.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-doxia/src/main/java/org/xwiki/rendering/internal/renderer/doxia/DoxiaSinkListener.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/pom.xml R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/main/java/org/xwiki/rendering/internal/parser/twiki/TWikiParser.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/main/java/org/xwiki/rendering/internal/twiki/TWiki10SyntaxProvider.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/main/resources/META-INF/components.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/java/org/xwiki/rendering/internal/twiki/TWiki10SyntaxProviderTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/java/org/xwiki/rendering/internal/twiki/TWikiCompatibilityTest.java R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/config.properties R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/bold/bold1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/bold/bold2.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/bold/bold3.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/italic/italic1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/list/list1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/monospace/monospace1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/paragraph/paragraph1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/section/section1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/verbatim/verbatim1.in.txt R xwiki-rendering-syntaxes/xwiki-rendering-syntax-twiki/src/test/resources/twiki10/simple/verbatim/verbatim2.in.txt Log Message: ----------- XRENDERING-757: Move Doxia based modules to contrib To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-rendering/settings/notifications

1 0

[jira@xwiki.org][Issue] Updates for XRENDERING-757: Move Doxia based modules to contrib
by XWiki Notifications 04 Oct '24

04 Oct '24

1 0

[jira@xwiki.org][Issue] Updates for XWIKI-22351: The autosave triggers a merge conflict sometimes even if there's no save done outside the realtime session
by XWiki Notifications 04 Oct '24

04 Oct '24

1 0

[jira@xwiki.org][Issue] Updates for XWIKI-22224: Sometimes when the automatically Saved is done the Menu bar dissapears
by XWiki Notifications 04 Oct '24

04 Oct '24

1 0

[xwiki/xwiki-platform] 859150: XWIKI-22351: The autosave triggers a merge conflic...
by XWiki Notifications 04 Oct '24

04 Oct '24

Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: 859150471ed7d4d6be892aec8ea4006b2d80a713 https://github.com/xwiki/xwiki-platform/commit/859150471ed7d4d6be892aec8ea4… 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: 7bdc3fa9434c57a0cfb4437d628d876572b00b00 https://github.com/xwiki/xwiki-platform/commit/7bdc3fa9434c57a0cfb4437d628d… 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/53e75e8abe1e...7bdc3fa9434c To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications

1 0

[xwiki/xwiki-platform] 8c3ddd: XWIKI-22351: The autosave triggers a merge conflic...
by XWiki Notifications 04 Oct '24

04 Oct '24

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

1 0

[xwiki/xwiki-platform] ac0556: XWIKI-22351: The autosave triggers a merge conflic...
by XWiki Notifications 04 Oct '24

04 Oct '24

Branch: refs/heads/stable-16.8.x Home: https://github.com/xwiki/xwiki-platform Commit: ac0556e0e7d412ae29be67a6c7346a2d0c2ec266 https://github.com/xwiki/xwiki-platform/commit/ac0556e0e7d412ae29be67a6c734… 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: fbfabe755a1f5e67ed5d91cfed8bea79c0698ce0 https://github.com/xwiki/xwiki-platform/commit/fbfabe755a1f5e67ed5d91cfed8b… 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/87ba19a7bc9f...fbfabe755a1f To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications

1 0

[xwiki/xwiki-platform] 62264a: XWIKI-22351: The autosave triggers a merge conflic...
by XWiki Notifications 04 Oct '24

04 Oct '24

Branch: refs/heads/master Home: https://github.com/xwiki/xwiki-platform Commit: 62264aed58e3756d15649cafd4aface92a43c38e https://github.com/xwiki/xwiki-platform/commit/62264aed58e3756d15649cafd4af… 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 Commit: eb581d422a84220099d734172032b0b4dd305003 https://github.com/xwiki/xwiki-platform/commit/eb581d422a84220099d734172032… 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 Compare: https://github.com/xwiki/xwiki-platform/compare/ea4bd72d4aee...eb581d422a84 To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications

1 0