Branch: refs/heads/master
Home: https://github.com/xwiki/xwiki-platform
Commit: 821d43ec45e67d45a6735a0717b9b77fffc1cd9f
https://github.com/xwiki/xwiki-platform/commit/821d43ec45e67d45a6735a0717b9…
Author: pjeanjean <pierre.jeanjean(a)xwiki.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/EditIT.java
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
Log Message:
-----------
XWIKI-21626: Improve escaping during conflict resolution
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: 39141b90c6b4297f72039be99dceed177c77c27b
https://github.com/xwiki/xwiki-platform/commit/39141b90c6b4297f72039be99dce…
Author: Michael Hamann <michael.hamann(a)xwiki.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/PagePickerIT.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/resources/BaseSearchResult.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/WikisResourceIT.java
Log Message:
-----------
XWIKI-20632: Page searched by its exact name is not found in a page picker for a macro parameter when its subtree is larger than 10 pages (#2945)
* Search only in the actual page name, not in the space hierarchy.
* Add tests.
(cherry picked from commit d9e3fad811a2b4ee26cadf9929e59269172ac4d1)
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications
Branch: refs/heads/backport-2945-to-stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 2720a9b3ad3f389dd5dffd31bf09b6ed3c53a27a
https://github.com/xwiki/xwiki-platform/commit/2720a9b3ad3f389dd5dffd31bf09…
Author: Michael Hamann <michael.hamann(a)xwiki.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/PagePickerIT.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/resources/BaseSearchResult.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/WikisResourceIT.java
Log Message:
-----------
XWIKI-20632: Page searched by its exact name is not found in a page picker for a macro parameter when its subtree is larger than 10 pages (#2945)
* Search only in the actual page name, not in the space hierarchy.
* Add tests.
(cherry picked from commit d9e3fad811a2b4ee26cadf9929e59269172ac4d1)
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: d9e3fad811a2b4ee26cadf9929e59269172ac4d1
https://github.com/xwiki/xwiki-platform/commit/d9e3fad811a2b4ee26cadf9929e5…
Author: Michael Hamann <michael.hamann(a)xwiki.com>
Date: 2024-03-21 (Thu, 21 Mar 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-test/xwiki-platform-flamingo-skin-test-docker/src/test/it/org/xwiki/flamingo/test/docker/PagePickerIT.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-server/src/main/java/org/xwiki/rest/internal/resources/BaseSearchResult.java
M xwiki-platform-core/xwiki-platform-rest/xwiki-platform-rest-test/xwiki-platform-rest-test-tests/src/test/it/org/xwiki/rest/test/WikisResourceIT.java
Log Message:
-----------
XWIKI-20632: Page searched by its exact name is not found in a page picker for a macro parameter when its subtree is larger than 10 pages (#2945)
* Search only in the actual page name, not in the space hierarchy.
* Add tests.
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications