Branch: refs/heads/master
Home: https://github.com/xwiki-contrib/confluence
Commit: 42bb2a5959984ea16beed88a640d24f22994c39c
https://github.com/xwiki-contrib/confluence/commit/42bb2a5959984ea16beed88a…
Author: Raphaël Jakse <raphael.jakse(a)xwiki.com>
Date: 2024-03-28 (Thu, 28 Mar 2024)
Changed paths:
M confluence-xml/src/main/resources/META-INF/components.txt
Log Message:
-----------
Misc: Sort components.txt
Commit: 8ffe198aadd14a9a68439458b187c2c6d55e9f87
https://github.com/xwiki-contrib/confluence/commit/8ffe198aadd14a9a68439458…
Author: Raphaël Jakse <raphael.jakse(a)xwiki.com>
Date: 2024-03-28 (Thu, 28 Mar 2024)
Changed paths:
A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/NoformatMacroConverter.java
M confluence-xml/src/main/resources/META-INF/components.txt
M confluence-xml/src/test/resources/confluencexml/4.3.2.rangefrom.test
M confluence-xml/src/test/resources/confluencexml/4.3.2.rangefromexclude.test
M confluence-xml/src/test/resources/confluencexml/4.3.2.ranges.test
M confluence-xml/src/test/resources/confluencexml/4.3.2.test
A confluence-xml/src/test/resources/confluencexml/noformat.test
A confluence-xml/src/test/resources/confluencexml/noformat/entities.xml
Log Message:
-----------
CONFLUENCE-227: Support noformat
Commit: cb18a0b2378ffc1381186ba635021709e3b1081b
https://github.com/xwiki-contrib/confluence/commit/cb18a0b2378ffc1381186ba6…
Author: Raphaël Jakse <raphael.jakse(a)xwiki.com>
Date: 2024-03-28 (Thu, 28 Mar 2024)
Changed paths:
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/ConfluenceXHTMLInputProperties.java
Log Message:
-----------
Misc: fix wrong versions
Commit: 17dea3cd547e1cf48205fe327e493b9d78ae472c
https://github.com/xwiki-contrib/confluence/commit/17dea3cd547e1cf48205fe32…
Author: Raphaël Jakse <raphael.jakse(a)xwiki.com>
Date: 2024-03-28 (Thu, 28 Mar 2024)
Changed paths:
A confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/ConfluenceMacroSupport.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/ConfluenceXHTMLInputProperties.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/ConfluenceXHTMLInputFilterStream.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/ConfluenceXHTMLParser.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/ADFNodeHandler.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/MacroTagHandler.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/TaskTagHandler.java
M confluence-syntax-xhtml/src/main/java/org/xwiki/contrib/confluence/parser/xhtml/internal/wikimodel/TimeTagHandler.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/MacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceInputFilterStream.java
A confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/input/ConfluenceXMLMacroSupport.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/AnchorMacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/DefaultMacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/IncludeMacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/JiraMacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/MentionMacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/NoformatMacroConverter.java
M confluence-xml/src/main/java/org/xwiki/contrib/confluence/filter/internal/macros/WarningMacroConverter.java
M confluence-xml/src/main/resources/META-INF/components.txt
A confluence-xml/src/test/java/org/xwiki/contrib/confluence/filter/ViewFileMacro.java
M confluence-xml/src/test/resources/META-INF/components.txt
A confluence-xml/src/test/resources/confluencexml/viewfileblock.test
A confluence-xml/src/test/resources/confluencexml/viewfileblock/entities.xml
Log Message:
-----------
CONFLUENCE-221: Some block macros are rendered inline
Compare: https://github.com/xwiki-contrib/confluence/compare/124a84464102...17dea3cd…
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki-contrib/confluence/settings/notifications
Branch: refs/heads/stable-15.10.x
Home: https://github.com/xwiki/xwiki-platform
Commit: 8ae07eee35f5856daf24dae08968c7cdec49cc05
https://github.com/xwiki/xwiki-platform/commit/8ae07eee35f5856daf24dae08968…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2024-03-28 (Thu, 28 Mar 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
Log Message:
-----------
XWIKI-22042: Mail Prepare Thread error still occurs in some cases when triggering the mail sending job from Scheduler
* Bulletproof usage of #createDocumentDiff by ensuring the docs are
not null before calling it
* Fix related test
(cherry picked from commit f19bd6fa13aee6600432e171409dd8570486f339)
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: f19bd6fa13aee6600432e171409dd8570486f339
https://github.com/xwiki/xwiki-platform/commit/f19bd6fa13aee6600432e171409d…
Author: Simon Urli <simon.urli(a)xwiki.com>
Date: 2024-03-28 (Thu, 28 Mar 2024)
Changed paths:
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/diff_macros.vm
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/main/resources/templates/notification/email/macros.vm
M xwiki-platform-core/xwiki-platform-web/xwiki-platform-web-templates/src/test/java/org/xwiki/web/NotificationMailDefaultHtmlTest.java
Log Message:
-----------
XWIKI-22042: Mail Prepare Thread error still occurs in some cases when triggering the mail sending job from Scheduler
* Bulletproof usage of #createDocumentDiff by ensuring the docs are
not null before calling it
* Fix related test
To unsubscribe from these emails, change your notification settings at https://github.com/xwiki/xwiki-platform/settings/notifications