Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 1b434cfcc4e121d2d172b454b56086993815d83d
https://github.com/xwiki/xwiki-platform/commit/1b434cfcc4e121d2d172b454b560…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
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-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-22077: Merge conflict when adding content after a user leaves the Realtime Collaboration
* Add a functional test to prove the issue is fixed.
(cherry picked from commit eebf3d83da42f045640a424f3883a22b010708a5)
Commit: ba05d78886589967dad3aaa5451c2e971dd8737a
https://github.com/xwiki/xwiki-platform/commit/ba05d78886589967dad3aaa5451c…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-loading/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js
Log Message:
-----------
XWIKI-22551: Information box content lost when multiple users update the macro parameters at the same time
* Wait for the editor to be ready before focusing it when coming back from the macro wizard.
* Mark the editor ready after the event loop (i.e. with a slight delay) and double check that it's ready
* Update widget selection after restoring the selection as a result of a remote change
(cherry picked from commit b65623c8486aac3dd291d42b449c1e01bbc64a25)
Compare: https://github.com/xwiki/xwiki-platform/compare/bdc1042ee39d...ba05d7888658
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: 6faf9c8d4dacc91e225dee585cf1a641659d8b10
https://github.com/xwiki/xwiki-platform/commit/6faf9c8d4dacc91e225dee585cf1…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
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-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-22077: Merge conflict when adding content after a user leaves the Realtime Collaboration
* Add a functional test to prove the issue is fixed.
(cherry picked from commit eebf3d83da42f045640a424f3883a22b010708a5)
Commit: 37b794aa7e0f3ef12a92ee4a2cf4a6435d9007b6
https://github.com/xwiki/xwiki-platform/commit/37b794aa7e0f3ef12a92ee4a2cf4…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-loading/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js
Log Message:
-----------
XWIKI-22551: Information box content lost when multiple users update the macro parameters at the same time
* Wait for the editor to be ready before focusing it when coming back from the macro wizard.
* Mark the editor ready after the event loop (i.e. with a slight delay) and double check that it's ready
* Update widget selection after restoring the selection as a result of a remote change
(cherry picked from commit b65623c8486aac3dd291d42b449c1e01bbc64a25)
Compare: https://github.com/xwiki/xwiki-platform/compare/b23c98264d5b...37b794aa7e0f
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: 3af7ab4e4303ddf484078db1c19fe73904f912db
https://github.com/xwiki/xwiki-platform/commit/3af7ab4e4303ddf484078db1c19f…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
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-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-22077: Merge conflict when adding content after a user leaves the Realtime Collaboration
* Add a functional test to prove the issue is fixed.
(cherry picked from commit eebf3d83da42f045640a424f3883a22b010708a5)
Commit: 89fe2033927cf11ca6608c563b7c98f371643d32
https://github.com/xwiki/xwiki-platform/commit/89fe2033927cf11ca6608c563b7c…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-loading/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js
Log Message:
-----------
XWIKI-22551: Information box content lost when multiple users update the macro parameters at the same time
* Wait for the editor to be ready before focusing it when coming back from the macro wizard.
* Mark the editor ready after the event loop (i.e. with a slight delay) and double check that it's ready
* Update widget selection after restoring the selection as a result of a remote change
(cherry picked from commit b65623c8486aac3dd291d42b449c1e01bbc64a25)
Compare: https://github.com/xwiki/xwiki-platform/compare/fbfabe755a1f...89fe2033927c
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: eebf3d83da42f045640a424f3883a22b010708a5
https://github.com/xwiki/xwiki-platform/commit/eebf3d83da42f045640a424f3883…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
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-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-22077: Merge conflict when adding content after a user leaves the Realtime Collaboration
* Add a functional test to prove the issue is fixed.
Commit: b65623c8486aac3dd291d42b449c1e01bbc64a25
https://github.com/xwiki/xwiki-platform/commit/b65623c8486aac3dd291d42b449c…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-loading/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-macro/plugin.js
M xwiki-platform-core/xwiki-platform-ckeditor/xwiki-platform-ckeditor-plugins/src/main/webjar/xwiki-realtime/ckeditorRealtimeAdapter.js
Log Message:
-----------
XWIKI-22551: Information box content lost when multiple users update the macro parameters at the same time
* Wait for the editor to be ready before focusing it when coming back from the macro wizard.
* Mark the editor ready after the event loop (i.e. with a slight delay) and double check that it's ready
* Update widget selection after restoring the selection as a result of a remote change
Compare: https://github.com/xwiki/xwiki-platform/compare/aa99e0c40dba...b65623c8486a
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: bdc1042ee39ddb2e51c76aa0d70ea9c199f106bf
https://github.com/xwiki/xwiki-platform/commit/bdc1042ee39ddb2e51c76aa0d70e…
Author: Antoine Mottier <antoine.mottier(a)ow2.org>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm
Log Message:
-----------
Fix the redirect URL growing indefinitely
This prevent appending current page URL to URL redirect parameter if already define for login and register actions.
Fix XWIKI-17873.
(cherry picked from commit 26499a7a047e4a38f177d9e3d0ec5836ffd576df)
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: b23c98264d5bd69050f5be2ce473e087a6be7710
https://github.com/xwiki/xwiki-platform/commit/b23c98264d5bd69050f5be2ce473…
Author: Antoine Mottier <antoine.mottier(a)ow2.org>
Date: 2024-10-08 (Tue, 08 Oct 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/drawer.vm
Log Message:
-----------
Fix the redirect URL growing indefinitely
This prevent appending current page URL to URL redirect parameter if already define for login and register actions.
Fix XWIKI-17873.
(cherry picked from commit 26499a7a047e4a38f177d9e3d0ec5836ffd576df)
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications