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
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
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
Branch: refs/heads/stable-16.4.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 9d56c382e96da74c75086fb823aa08237f19e9a1
https://github.com/xwiki/xwiki-platform/commit/9d56c382e96da74c75086fb823aa…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2024-10-04 (Fri, 04 Oct 2024)
Changed paths:
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/pom.xml
Log Message:
-----------
XWIKI-22544: Error when upgrading the Debian solr package from 16.2.0 or 16.3.0
(cherry picked from commit ea4bd72d4aeecb9311d7778a55117c4f9fd1b2fe)
Commit: 9f903ee0679a2e39daee21ddbc57a00edfadd054
https://github.com/xwiki/xwiki-platform/commit/9f903ee0679a2e39daee21ddbc57…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2024-10-04 (Fri, 04 Oct 2024)
Changed paths:
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/src/deb/control/control
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/src/deb/control/control
Log Message:
-----------
XWIKI-22543: xwiki-solr9-extension_index package name does not follow specification
(cherry picked from commit c4a0aa0d14e403fb45ab0d1120d8a51ebc68940c)
Compare: https://github.com/xwiki/xwiki-platform/compare/15fce089fd57...9f903ee0679a
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: c4a0aa0d14e403fb45ab0d1120d8a51ebc68940c
https://github.com/xwiki/xwiki-platform/commit/c4a0aa0d14e403fb45ab0d1120d8…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2024-10-04 (Fri, 04 Oct 2024)
Changed paths:
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-all/src/deb/control/control
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/pom.xml
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/xwiki-platform-distribution-debian-solr-core-extension_index/src/deb/control/control
Log Message:
-----------
XWIKI-22543: xwiki-solr9-extension_index package name does not follow specification
Commit: ea4bd72d4aeecb9311d7778a55117c4f9fd1b2fe
https://github.com/xwiki/xwiki-platform/commit/ea4bd72d4aeecb9311d7778a5511…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2024-10-04 (Fri, 04 Oct 2024)
Changed paths:
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-solr/xwiki-platform-distribution-debian-solr-cores/pom.xml
Log Message:
-----------
XWIKI-22544: Error when upgrading the Debian solr package from 16.2.0 or 16.3.0
Compare: https://github.com/xwiki/xwiki-platform/compare/bbe7b32d162c...ea4bd72d4aee
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications