Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#340: Create htmlcomment macro bridge #341

Merged
merged 9 commits into from
Oct 10, 2024
Merged

Conversation

Josue-T
Copy link
Contributor

@Josue-T Josue-T commented Sep 5, 2024

Implement htmlcomment macro.

cf: #340

* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->

<xwikidoc version="1.5" reference="Confluence.Macros.HtmlComment" locale="">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you export the page using a 14.10 xwiki instance?

Copy link
Contributor Author

@Josue-T Josue-T Oct 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No I developed with a 16.04 instance. Should I re-export from a 14.10 instance ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. The current parent of the pro-macros is 13.10. However, we need to upgrade it to 14.10 asap. It should be ok for you export this macro from a 14.10 instance

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did a import/export from a 14.10 instance. I still have the xwikidoc version="1.5" but some class fields was updated.

Josue-T and others added 4 commits October 7, 2024 12:08
…e-bridges-ui/src/main/resources/Confluence/Macros/HtmlComment.xml

Co-authored-by: Teo Caras <[email protected]>
…e-bridges-ui/src/main/resources/Confluence/Macros/HtmlComment.xml

Co-authored-by: Teo Caras <[email protected]>
…e-bridges-ui/src/main/resources/Confluence/Macros/HtmlComment.xml

Co-authored-by: Teo Caras <[email protected]>
* Rename page for more consistency
Josue-T and others added 4 commits October 7, 2024 14:33
…e-bridges-ui/src/main/resources/Confluence/Macros/ConfluenceHtmlComment.xml

Co-authored-by: Teo Caras <[email protected]>
…e-bridges-ui/src/main/resources/Confluence/Macros/ConfluenceHtmlComment.xml

Co-authored-by: Teo Caras <[email protected]>
* Re-export macro page from 14.10 instance
* Fix typo
* Add missing licence check
@Josue-T Josue-T requested a review from trrenty October 7, 2024 13:14
@raphj raphj merged commit e1877dc into xwikisas:main Oct 10, 2024
@Josue-T Josue-T deleted the htmlcomment branch October 10, 2024 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants