forked from hallowelt/migrate-confluence
-
Notifications
You must be signed in to change notification settings - Fork 0
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
Merge new updates #1
Open
jeffw16
wants to merge
108
commits into
mywikis:main
Choose a base branch
from
hallowelt:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Add preprocessors * Add IStructuredMacroProcessor * Working on unit test * Working on phpunit test * Dedicated class for StructuredMacroPanel and StructuredMacroColumn * Remove debug knock outs * Add removed function * Coding convention * Add panel macro to ConfluenceConverter * Improve output
* Add post processor for nested headings * Make a decision whether list or heading markup should be removed * Removed comments * Improve list item detection * Improve list item detection
#72) * Remove params of structured macro "children" because they are visible in wikitext. Add fallback if param depth is not set and add catergory "Broken_macro/children" in this case. ERM32256 * CC * Remove obsolete "depth" in div class if no depth is set * Remove data-params again and call in template in any case. * CC * Remove class subpagelist-depth-... * Remove html wrapper for temlate subpagelist
* Add structured macro processor for contentbylabel ERM27235 * Add cql parser * Fix phpunit test for ContentByLabel macro * Add some comments * CC * CC * CC
* Fix structured macro contentbylabel ERM27235 * Update StructuredMacroContenByLabel.php
* Add noformat macro and enable noformat and drawio macros * Use pre as replacement for noformat * Restore test data * Fix class name * Resolve conflict * Resolve conflict * Add class to identify pre tag as noformat macro --------- Co-authored-by: Robert Vogel <[email protected]>
ERM27235
* Bake diagram XML in the PNG image meta data * Change drawio default template content There was a problem with usage of "<bs:drawio {{{diagramName}}} />". In that case "bs:drawio" tag was parsed before "{{{diagramName}}}" parameter was passed. So it looked like diagram is named "{{{diagramName}}}". Now when using "{{#tag:drawio ... }}} diagram name is passed before parsing tag, so now it works correctly. --------- Co-authored-by: akulbii <[email protected]>
* Disable masking of table attributes Previously table attributes like "class" were masked before processing by "pandoc" because such attributes broke whole table convertion process. Newer "pandoc" versions handle such attributes corrently, so no need to do masking anymore. * Remove redundant use statements * Remove unused unit tests * Fix readme pandoc note * Update README.md * Update README.md --------- Co-authored-by: akulbii <[email protected]> Co-authored-by: DvogelHallowelt <[email protected]>
* debugging * Move baking diagram into PNG from composer to converter, handle '.unknown' files * Minor implementation fixes * Fix issue with getting DrawIO data file content That happened because of cutting of ".unknown" part of file name. Even if file could be called "diagram", ConfluenceAnalyzer anyway registers it with "diagram.unknown" name. When we look for a file content - we use target file name, so we should not cut off ".unknown" part. * Fix drawio image search * Remove error_log * CC * CC --------- Co-authored-by: akulbii <[email protected]>
* Add macro align ERM27235 * cc * cc
* Change way of looking for body contents * Add comments * Add title attachments fallback * CC --------- Co-authored-by: akulbii <[email protected]> Co-authored-by: dvogel <[email protected]>
* Improve task-list test ERM35879 * Add task macro monverter ERM35879 * Add Tasklist macro with droplet syntax ERM35879 * Update test for tasl-list macro ERM35879 * cc * cc * cc * Improve error handling ERM35879 * Update README.md ERM35879 * Update README.md and removed task-list templates ERM35879 * Bump PHP requirements * Update dev requirements * Update composer.json * Add processor and prosprocessor for time tag ERM35879 * iupdate README.md ERM35879 * CC ERM35879 * CC * CC * Fix info macro test * Fix info macro test --------- Co-authored-by: Robert Vogel <[email protected]>
* Add task reoprt ERM35879 * CC * Add additional test data for task-report-macro ERM35879 --------- Co-authored-by: Robert Vogel <[email protected]>
* Add macro view-file * CC
* Add space-details macro * CC
* Add space description as semantic property to Main Page * Change name of semantic property * Remove word confluence from template
* Add macro pagetree * Remove unused methods * CC * CC * Create fallback * CC
* Add processors for "details" and "detailsummary" macros Fixes - #101 - #103 * Register macros * Add new templates to README --------- Co-authored-by: Robert Vogel <[email protected]>
* Add processors for "details" and "detailsummary" macros Fixes - #101 - #103 * Register macros * Add new templates to README * Add processors for "attachments", "include" and "excerpt-inlcude" * Add ExcerptInclude template * Final implementation --------- Co-authored-by: Robert Vogel <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.