Branch: refs/heads/stable-15.10.x Home: https://github.com/xwiki/xwiki-platform Commit: 2e791497dc4839384dc92f76779ff81f51b53b40 https://github.com/xwiki/xwiki-platform/commit/2e791497dc4839384dc92f76779ff... Author: Michael Hamann <michael.hamann@xwiki.com> Date: 2024-10-24 (Thu, 24 Oct 2024) Changed paths: M xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/src/main/java/org/xwiki/rendering/internal/macro/display/DisplayMacro.java M xwiki-platform-core/xwiki-platform-display/xwiki-platform-display-macro/src/test/java/org/xwiki/rendering/internal/macro/DisplayMacroTest.java M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/src/main/java/org/xwiki/rendering/internal/macro/include/IncludeMacro.java M xwiki-platform-core/xwiki-platform-rendering/xwiki-platform-rendering-macros/xwiki-platform-rendering-macro-include/src/test/java/org/xwiki/rendering/internal/macro/include/IncludeMacroTest.java Log Message: ----------- XWIKI-21125: Include and Display macros should generate inline content when used in an inline context * Convert the content to inline when the macro is called in an inline context. * Add tests for inline mode.sho (cherry picked from commit 1950fae7e422fb9527a0d335d6727f6fc55d2258) To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications