Merge new updates#1
Open
jeffw16 wants to merge 299 commits into
Open
Conversation
* Investigate: Categories not added to content * Fix CC Co-authored-by: rvogel <vogel@hallowelt.biz>
* Avoid numeric namespace prefix for user namespaces * Add space-name-to-prefix-map * CC * CC * Add log missing-attachment-id-to-filename * CC
* Build up UserImpl map * Apply CC Co-authored-by: rvogel <vogel@hallowelt.biz>
* Fixed empty [[File: statements after compose step. Added additional log files for investigation. * CC
* Update README.md * Update README.md
* Fix broken images caused by namespace in page title * Testing NULL links * Rename method * Add bucket 'attachment-orig-filename-target-filename-map' to crate a fallback if image exists but not for the related page * Removed comments * Add postProcessor for headings with line-break * Fix broken page links with wrong titles or spaceId -1 * Rename variables * Set attachment name for links * Get spaceId form spaceKey for link * Fix unittest * Add unit test for preprocessor FixLineBreakInHeadings * CC
* Add `checkresult` command stub * Implement `checkresult` command Co-authored-by: rvogel <vogel@hallowelt.biz>
* Issue 50: Links without labels ERM28387 * CC
#57) * Issue 53: Images with URLs to actual attachment but without attachment ref are not converted ERM28390 * Remove handling of external images from ConfluenceConverter and create own post processor * Use other url for FixImageWithExternalUrl unittest
* Add Questions and yaml file input for configuration * Add Question for main page name * Add question for space prefix * Connect question for mainpage with TitleBuilder * Modify filename in image link for NsFileRepo compatibility * cc * Adding yaml config * Add yaml config to commands extract and convert * CC * Changes after feedback * Add unittest for convertable entity Image with NSFileRepo compatibility * Add config.sample.yaml * Fix config.sample.yaml * Fix config.sample.yaml * Fix adding config * Remove user interaction * Update README.md * Fix config key for confg.yaml
* Fix CODE macro If we convert CODE into `<syntaxhighlight>` before `pandoc` conversion, it will get lost. * CC * Working on PreserveCode * Preserve code * Restore code Co-authored-by: rvogel <vogel@hallowelt.biz> Co-authored-by: dvogel <daniel.vogel@hallowelt.com>
* Fix media links for extNsFileRepo * Use NSFileRepo compatibility for links * Use NSFileRepo for media link * Update phpunit test for Link * Working on new processors for links * CC * Improving unittests * Add UserLinkProcessor and remove old unittests for Link * Remove ConvertableEntity Link * Remove debug statement * CC * Improve unittests * Improve unittests * Fix additional media links * Improve adding aditional media links * CC * CC * Rename processors * Rename AttachmentLink processor * Fix filename for test * Fix filenams for test * Fix classname for test * Remove unused `use` statements Co-authored-by: Robert Vogel <1201528+osnard@users.noreply.github.com> Co-authored-by: rvogel <vogel@hallowelt.biz>
* Add emoticon processor * CC Co-authored-by: rvogel <vogel@hallowelt.biz>
* Add image processor * Add unit test * Remove tests for convertable entities * Add test for spaceId GENERAL
* Fix Image porcessor * Add image with page link * Improve phpunit test * CC * Fix issue with not existing page node * Fix space id if no page element is available * Working on image, image page links and user links * Working on tasklist macro * Add inline-comment-marker and placeholder macro * Remove hard coded structured macro porcessors from convert script * Use dom instead of xpath for structured macros * CC * Fix unit test for user link * Add processor for structured-macro toc * Add structured macro recently-updated processor * CC * CC * Fix unittests * CC
* Add structured macro processor for macro children * CC
* Add structured macro processor for DrawIO #60 * Working on unittest for DrawIO * Implement DrawIO and improve tests * CC * Use tag instead of parser function for drawio wiki text * Use a template to insert drawIO elements * Rename drawio processor
* 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
Use sqlite
Resolve merge conflicts by adopting main's SQLite-based architecture and porting template support (PageTemplates analyzer, CreateFromTemplateMacro converter, TemplateContentPostProcessor composer) to use WorkspaceDB and DBConversionDataLookup instead of DataBuckets. Changes: - Add page_templates table to WorkspaceDB with CRUD methods - Add getTemplateTitleFromTemplateId to DBConversionDataLookup - Rewrite PageTemplates analyzer processor to use WorkspaceDB - Update CreateFromTemplateMacro to use DBConversionDataLookup - Update Composer Pages to use new ProcessorBase constructor - Add extractTemplateContents to ConfluenceExtractor - Accept deletion of ConversionDataLookup.php (replaced by DB variant) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Fix encoded & in file titles
Replace old ConversionDataLookup with DBConversionDataLookup + WorkspaceDbMock, seeding page_templates table with test fixtures instead of passing arrays. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
# Conflicts: # src/Composer/ConfluenceComposer.php
Add create-from-template-macro
Fix & character in filenames
Use __NOTOC__ if no toc macro was used on page
* reduce db access with transactions, add caching, fix bug in gallery macro ERM48021
handle colgroup and is removing whole table structure then
Add a preprocessor to remove colgroup from table because pandoc can't
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.