Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: e67cf9fdcc2a1264cf8243517086a62f5ed909cb
https://github.com/xwiki/xwiki-platform/commit/e67cf9fdcc2a1264cf8243517086…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2023-12-28 (Thu, 28 Dec 2023)
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-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-ui/src/main/resources/XWiki/Realtime/WysiwygEditor.xml
A 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/filters.js
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/loader.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-21661: RealtimeWYSIWYGEditorIT#inplaceEditableMacro is flickering
XWIKI-21660: RealtimeWYSIWYGEditorIT#applyInlineStylesOnTheSameParagraph is flickering
XWIKI-21656: RealtimeWYSIWYGEditorIT#editWithSelf is flickering
XWIKI-21605: RealtimeWYSIWYGEditorIT#editDifferentParagraphs is flickering
* Bulletproof RichTextAreaElement#waitForPlaceholder to try again when failing due to StaleElementReferenceException (because the coeditor placeholders are often replaced / recreated when the coeditors are changing their position / selection).
* Start moving the code that is specific to CKEditor in a separate JavaScript module, behind a generic interface / API (this required some refactoring).
* Separate generic HyperJSON filters from the ones that are specific to CKEditor.
* Drop the Diff (changes) filters and instead "rebase" local changes on top of the received remote changes. This means we now have to implement and maintain a single set of filters: the HyperJSON filters.
* Normalize the DOM before serializing it to HyperJSON (this includes adding a BR in empty blocks and after non-empty text nodes that are followed by a block).
* Improve the selection restore (because the selection can be affected even if the modified DOM nodes are outside, e.g. if the modified nodes are siblings of the selection start / end container).
(cherry picked from commit aad3b2830bc7202c4ed2b607426a08aaf4edacbd)
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: aad3b2830bc7202c4ed2b607426a08aaf4edacbd
https://github.com/xwiki/xwiki-platform/commit/aad3b2830bc7202c4ed2b607426a…
Author: Marius Dumitru Florea <marius(a)xwiki.com>
Date: 2023-12-28 (Thu, 28 Dec 2023)
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-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-ui/src/main/resources/XWiki/Realtime/WysiwygEditor.xml
A 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/filters.js
M xwiki-platform-core/xwiki-platform-realtime/xwiki-platform-realtime-wysiwyg/xwiki-platform-realtime-wysiwyg-webjar/src/main/webjar/loader.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-21661: RealtimeWYSIWYGEditorIT#inplaceEditableMacro is flickering
XWIKI-21660: RealtimeWYSIWYGEditorIT#applyInlineStylesOnTheSameParagraph is flickering
XWIKI-21656: RealtimeWYSIWYGEditorIT#editWithSelf is flickering
XWIKI-21605: RealtimeWYSIWYGEditorIT#editDifferentParagraphs is flickering
* Bulletproof RichTextAreaElement#waitForPlaceholder to try again when failing due to StaleElementReferenceException (because the coeditor placeholders are often replaced / recreated when the coeditors are changing their position / selection).
* Start moving the code that is specific to CKEditor in a separate JavaScript module, behind a generic interface / API (this required some refactoring).
* Separate generic HyperJSON filters from the ones that are specific to CKEditor.
* Drop the Diff (changes) filters and instead "rebase" local changes on top of the received remote changes. This means we now have to implement and maintain a single set of filters: the HyperJSON filters.
* Normalize the DOM before serializing it to HyperJSON (this includes adding a BR in empty blocks and after non-empty text nodes that are followed by a block).
* Improve the selection restore (because the selection can be affected even if the modified DOM nodes are outside, e.g. if the modified nodes are siblings of the selection start / end container).
Branch: refs/heads/XWIKI-21738
Home: https://github.com/xwiki/xwiki-platform
Commit: fc6dd5f5948385523b11fbfbe2e3c4c39913ee66
https://github.com/xwiki/xwiki-platform/commit/fc6dd5f5948385523b11fbfbe2e3…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-27 (Wed, 27 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/DocumentMovedListener.java
R xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/NotificationFilterPreferenceConfiguration.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/internal/NotificationFilterPreferenceStore.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/migration/R140401000XWIKI15460DataMigration.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/migration/R151002000XWIKI21448DataMigration.java
A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/migration/R160000001XWIKI21738DataMigration.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/test/java/org/xwiki/notifications/filters/internal/DocumentMovedListenerTest.java
R xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/test/java/org/xwiki/notifications/filters/internal/NotificationFilterPreferenceConfigurationTest.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/test/java/org/xwiki/notifications/filters/internal/NotificationFilterPreferenceStoreTest.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/test/java/org/xwiki/notifications/filters/migration/R140401000XWIKI15460DataMigrationTest.java
Log Message:
-----------
XWIKI-21738: Remove uselocastore/usemainstore configurations for better maintenance
Start refactoring by removing entirely
NotificationFilterPreferenceConfiguration since it's now useless. Remove
also calls to useMainStore/useLocalStore where needed and fix tests.
Started to define migration but not implemted yet.
WIP: migration not yet impleemnted and coverage failing.
Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: aa8d7045cf73b3e17e5917d241474e78641fddb0
https://github.com/xwiki/xwiki-platform/commit/aa8d7045cf73b3e17e5917d24147…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2023-12-27 (Wed, 27 Dec 2023)
Changed paths:
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/pom.xml
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/checkstyle/checkstyle-suppressions.xml
A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/migration/R160000000XWIKI17243DataMigration.java
A xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/java/org/xwiki/notifications/filters/migration/WatchListObjectsRemovalTaskConsumer.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-default/src/main/resources/META-INF/components.txt
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/main/java/org/xwiki/notifications/filters/watch/internal/DefaultWatchedEntitiesConfiguration.java
M xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watch/src/test/java/org/xwiki/notifications/filters/watch/internal/DefaultWatchedEntitiesConfigurationTest.java
R xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watchlistbridge/pom.xml
R xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watchlistbridge/src/main/java/org/xwiki/notifications/filters/watchlistbridge/internal/WatchlistBridgeProvider.java
R xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-filters/xwiki-platform-notifications-filters-watchlistbridge/src/main/resources/META-INF/components.txt
M xwiki-platform-distribution/xwiki-platform-distribution-war-dependencies/pom.xml
Log Message:
-----------
XWIKI-17243: Migrate WatchListClass objects to the new Notifications filter storage (#2726)
* Add a new migration to properly save the old WatchListClass objects
as filter preferences using the NotificationFilterPreferenceStore
* Reuse the logic provided in the old bridge for performing the
migration
* Get rid of the the watchlistbridge module as it was only containing
the component for performing the bridge
* Fix error in the migration
* Use a TaskConsumer for performing final clean up of the objects
* Migrate autowatch property to a new Autowatch xobject whenever
that one doesn't exist and there's a WatchListClass xobject before
removing it, as we use to fallback on those xobject properties in
DefaultWatchEntitiesConfiguration
* Fix test DefaultWatchEntitiesConfiguration and refactor it