Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 9d6246c2d154812188dfbd30a8d3e426614d7dd3
https://github.com/xwiki/xwiki-platform/commit/9d6246c2d154812188dfbd30a8d3…
Author: Dorian OUAKLI <dorian.ouakli(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
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/pom.xml
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/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/patches.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-19180: In case of merge conflict choosing "Reload editors" won't refresh the content
XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs
(cherry picked from commit b27c76762d6eaa24bd99ca3d4018c826af9c4665)
(cherry picked from commit 6ec6429371b39fc39313f6948762f181997a2add)
Commit: ddab352072aff2f7f519510680492a1f602f066f
https://github.com/xwiki/xwiki-platform/commit/ddab352072aff2f7f51951068049…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Log Message:
-----------
Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Fix typo.
(cherry picked from commit 79abddec346242bfc11a78023e0751a4dbed4bc3)
(cherry picked from commit 390e3d57758f7b7fb1eb0ec2cc6854526ebb8e51)
Commit: 8ff102a5e35e5eda221bf60484ff923c3cad1994
https://github.com/xwiki/xwiki-platform/commit/8ff102a5e35e5eda221bf60484ff…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
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:
-----------
Update 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
Update test order.
(cherry picked from commit 9be71d4d3cbe3dcc9d7ec794cec8dec11d5d93fb)
(cherry picked from commit 56539ea94d486db9410c52bacf03e6dbbfd5db34)
Commit: 3682a16b023f7abbf8a6d13c2989edb92e38d4d3
https://github.com/xwiki/xwiki-platform/commit/3682a16b023f7abbf8a6d13c2989…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
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:
-----------
Update 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
Remove extra empty line.
(cherry picked from commit 9099044e8e495305b783a439d1a3e003f71f81eb)
(cherry picked from commit b874475442796aec8577ef872e3ed91a361a826e)
Commit: d8865af10e64017421eaef2f20da396dc77431df
https://github.com/xwiki/xwiki-platform/commit/d8865af10e64017421eaef2f20da…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
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:
-----------
Update 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
Update test order.
(cherry picked from commit 84a1f0065131f2b99e26ad178d09db42e6cb234a)
(cherry picked from commit 7fa923f63bfd5f7186333e654f3ba24dfc323020)
Compare: https://github.com/xwiki/xwiki-platform/compare/82aa87f83e4d...d8865af10e64
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: 0a66b1a899e8a2c334a2fb3379c6c9ff42d21dd5
https://github.com/xwiki/xwiki-platform/commit/0a66b1a899e8a2c334a2fb3379c6…
Author: Thomas Mortagne <thomas.mortagne(a)gmail.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
M xwiki-platform-distribution/xwiki-platform-distribution-debian/xwiki-platform-distribution-debian-common/src/deb/control/control
Log Message:
-----------
XWIKI-21825: Java 11 should be removed from accepted dependencies in the XWiki Debian package
Branch: refs/heads/stable-16.0.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 6ec6429371b39fc39313f6948762f181997a2add
https://github.com/xwiki/xwiki-platform/commit/6ec6429371b39fc39313f6948762…
Author: Dorian OUAKLI <dorian.ouakli(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
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/pom.xml
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/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/patches.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-19180: In case of merge conflict choosing "Reload editors" won't refresh the content
XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs
(cherry picked from commit b27c76762d6eaa24bd99ca3d4018c826af9c4665)
Commit: 390e3d57758f7b7fb1eb0ec2cc6854526ebb8e51
https://github.com/xwiki/xwiki-platform/commit/390e3d57758f7b7fb1eb0ec2cc68…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Log Message:
-----------
Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Fix typo.
(cherry picked from commit 79abddec346242bfc11a78023e0751a4dbed4bc3)
Commit: 56539ea94d486db9410c52bacf03e6dbbfd5db34
https://github.com/xwiki/xwiki-platform/commit/56539ea94d486db9410c52bacf03…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
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:
-----------
Update 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
Update test order.
(cherry picked from commit 9be71d4d3cbe3dcc9d7ec794cec8dec11d5d93fb)
Commit: b874475442796aec8577ef872e3ed91a361a826e
https://github.com/xwiki/xwiki-platform/commit/b874475442796aec8577ef872e3e…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
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:
-----------
Update 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
Remove extra empty line.
(cherry picked from commit 9099044e8e495305b783a439d1a3e003f71f81eb)
Commit: 7fa923f63bfd5f7186333e654f3ba24dfc323020
https://github.com/xwiki/xwiki-platform/commit/7fa923f63bfd5f7186333e654f3b…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
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:
-----------
Update 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
Update test order.
(cherry picked from commit 84a1f0065131f2b99e26ad178d09db42e6cb234a)
Compare: https://github.com/xwiki/xwiki-platform/compare/222f73106783...7fa923f63bfd
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 82aa87f83e4dec7026858dc889e4e456ab8bdeb4
https://github.com/xwiki/xwiki-platform/commit/82aa87f83e4dec7026858dc889e4…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/editor.js
Log Message:
-----------
XWIKI-21558: If a macro is modified by another user while the macro edit modal is open, we cannot update the macro
* Fix failing test (restoring the focused and selected widgets by hand after an update is too fragile so better let CKEditor do it)
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: b27c76762d6eaa24bd99ca3d4018c826af9c4665
https://github.com/xwiki/xwiki-platform/commit/b27c76762d6eaa24bd99ca3d4018…
Author: Dorian OUAKLI <dorian.ouakli(a)xwiki.com>
Date: 2024-01-22 (Mon, 22 Jan 2024)
Changed paths:
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
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/pom.xml
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/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/patches.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-19180: In case of merge conflict choosing "Reload editors" won't refresh the content
XWIKI-19181: The autosave doesn't behave nicely when a merge conflict occurs
Commit: 79abddec346242bfc11a78023e0751a4dbed4bc3
https://github.com/xwiki/xwiki-platform/commit/79abddec346242bfc11a78023e07…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Log Message:
-----------
Update xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-webjar/src/main/webjar/saver.js
Fix typo.
Commit: 9be71d4d3cbe3dcc9d7ec794cec8dec11d5d93fb
https://github.com/xwiki/xwiki-platform/commit/9be71d4d3cbe3dcc9d7ec794cec8…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
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:
-----------
Update 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
Update test order.
Commit: 9099044e8e495305b783a439d1a3e003f71f81eb
https://github.com/xwiki/xwiki-platform/commit/9099044e8e495305b783a439d1a3…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
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:
-----------
Update 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
Remove extra empty line.
Commit: 84a1f0065131f2b99e26ad178d09db42e6cb234a
https://github.com/xwiki/xwiki-platform/commit/84a1f0065131f2b99e26ad178d09…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-23 (Tue, 23 Jan 2024)
Changed paths:
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:
-----------
Update 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
Update test order.
Commit: bd40c93cb438a1a3c3ec2e257b8080264f32a944
https://github.com/xwiki/xwiki-platform/commit/bd40c93cb438a1a3c3ec2e257b80…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2024-01-24 (Wed, 24 Jan 2024)
Changed paths:
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/Ajax.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/main/resources/RTFrontend/ConvertHTML.xml
R xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-ui/src/test/java/org/xwiki/realtime/ui/ConvertHTMLPageTest.java
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/pom.xml
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/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/patches.js
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/wysiwygEditor.js
Log Message:
-----------
Merge pull request #2622 from douakli/XWIKI-19180
XWIKI-19180: In case of merge conflict choosing "Reload editors" won't refresh the content
Compare: https://github.com/xwiki/xwiki-platform/compare/7b5c55237121...bd40c93cb438