Skip to content

Merge new updates#1

Open
jeffw16 wants to merge 392 commits into
mywikis:mainfrom
hallowelt:main
Open

Merge new updates#1
jeffw16 wants to merge 392 commits into
mywikis:mainfrom
hallowelt:main

Conversation

@jeffw16

@jeffw16 jeffw16 commented Dec 21, 2021

Copy link
Copy Markdown
Member

No description provided.

DvogelHallowelt and others added 30 commits February 25, 2026 11:03
* Improve space id from space key lookup

* Fix unit tests

* CC

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* Fix analyzer buckets

* CC

* Add composer.lock
* Ensure correct value type in bucket

* Ensure correct value type in bucket

* Ensure correct value type in bucket

* Ensure correct value type in bucket

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* Add Dockerfile

* Update dockerfile and add some security clauses

* Update README.md
* Fix space descritption on space main page

* CC
* Refactor analyzer processors with xml reader

* Prevent overwriting pages-titles-map and converting links with wrong targets

* Remove debug statements

* CC

* CC

* CC

* Fix unittests

* CC

* CC

* CC

* Improve anaylzer check
* Embedd files directly in xml

ERM46809

Requires hallowelt/mediawiki-lib-mediawikixml#5

* Disable php memory_limit in docker with php.ini file

* CC

* CC

* CC

* Set files in xml to hold as long as there is no import script

* Add comment

* CC
* Implement gallery macro (#156)

* Implement gallery macro (#156)

* Implement gallery macro (#156)

* Update gallery macro to utilize all file types that are given in gallery macro

* Update gallery macro to utilize all file types that are given in gallery macro

* wrap in div with params

* add test files

* utilize page param

* added empty param name check in base class

* add test files

* process excludeLabel and includeLabel parameter

* code style

* use global-attachment-metadata bucket

* use global-attachment-id-to-confluence-file-key-map bucket

* return full attachment metadata

* fill bucket for global attachment in attachment fallback

* code style

* fix texts

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* Fixing namespace file repo

* Fix file upload

* CC

* CC
* Fixing namespace file repo

* Fix file upload

* CC

* CC

* Fixing smaller issues

* remove composer lock

---------

Co-authored-by: Daniel Vogel <daniel.vogel@hallowelt.com>
Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* Improve contentbylabel macro cql

* CC

* CC
* Update Readme.md

* Fix typos
)

* Fix bug introduced with 5870d62 and introduce full migration tests

* add pandoc to github pipeline

* fix test

* codestyle

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* implement blogpost

* implement blogpost

* use space id for blog post namespace

* add content model

* add content model

* use title builder

* introduce blogpost buckets

* add test

* seperate blogs and pages, use titlebuilder

* seperate blogs and pages, use titlebuilder

* rename to ParentBlogPosts

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* Add LocalTabMacro processor and LocalTabGroupMacro processor

* Add ExcerptMacro processor

* Add processors for viewdoc, viewxls and viewpdf macros

* Add Processor for unhandled macros

* Remove legacy macro conversion vorm ConfluenceConverter

* Update default pages

* Add new processors to converter

* CC

* CC

* Fix use statement

* CC

* Remove FullMigrationTest - I won't update the xml file for each new macro

* Revert "Remove FullMigrationTest - I won't update the xml file for each new macro"

This reverts commit f1c077b.

* Improve FullMigrationTest

* Move FullMigration

* CC
* Support comments

* Support comments

* support comments

* support comments

* Fix bug introduced with 5870d62 and introduce full migration tests

* add pandoc to github pipeline

* fix test

* codestyle

* handle warning

* test: extend FullMigration test with comment support and comments.xml verification

- Add ConfluenceUserImpl, Comment, and BodyContent objects to the
  source fixture so the full comment pipeline path is exercised
- Fix runExtract() bucket list: add global-body-content-id-to-comment-id-map
- Fix runCompose() bucket list: add global-page-id-to-comment-ids-map,
  global-comment-id-to-metadata-map, global-page-id-to-title-map,
  global-userkey-to-username-map
- Assert that result/comments.xml is generated and matches
  external_image_url_export_result_comments.xml
- Add external_image_url_export_result_comments.xml fixture with
  expected Talk page containing cs-comments JSON slot

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

* add test

* update test

* create timestamp in analyzer

* use xml reader, rename to ContentProperties

* Use mediawili-lib-mediawikixml to build comments page xml

* fix test

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Co-authored-by: Daniel Vogel <daniel.vogel@hallowelt.com>
…umn (#188)

* Add processors for layout, layout-section and layout-cell

* Fix unittest

* Add/update templates for layout, layout-section, layout-cell

* Improve css for layout-sections

* Improve/Add converter processor for panel and column

* Update ci.yaml
There may be legacy Confluence WikiText contents included in the export,
which can not be converted by this tool. In this case, we just want to
add them as raw text to the result.

Co-authored-by: rvogel <vogel@hallowelt.biz>
* Fix AttachmentFallback and add Macro ViewPpt

* Add unittest vor ViewPpt

* CC
danielriedmueller and others added 30 commits June 24, 2026 10:21
ERM48487
* Clean up and small bug fixes
* Fix test, fix invalid template test, remove redundant sql queries
* Refactored duplicated code
* Codestyle
…mmary macro (#307)

* Fix nested lists with list-style-type: none;
* Fix nested lists without parent list item value

ERM48595

* DetailsSummaryMacro outputs a empty table now
* Add PageProperties Macro and PagePropertiesReport Macro
* Removed page properties macro to another draft

ERM48569

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
ERM48487

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* Fix missing parent page titles (deleted pages)

* Update unittests

* Add additional logging for page titles

* Add exceptions for empty wiki titles

* Make exception message more exact
* Run extractor only once

* Fix finding extractors
)

* Fix title builder for main pages in spaces with a root page prefix

* Add description to the code
* Fix missing contents in xml

* Remove blank line

---------

Co-authored-by: Manuel Strehl <manuel.strehl@hallowelt.com>
This is not completely right, though. If there are .bak or
.orig files or whatever in src/ those will still be used
for the build context as well. Therefore the suggestion is
still to build the container from a clean working tree.
* Fix wrong time format and usage of unlocalized string

* Fix test

---------

Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
If a space description object has no matching space entry, we
ignore the space description.
Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
…315)

* set DISPLAYTITLE, if the Confluence title was significantly changed

* fine-tune DISPLAYTITLE and fix edge cases
* Add config validator

* CC
* Split result by space

* Remove unused imaged directory

* Move default files and pages to own processor

* Clean up code

* Clean up code

* Limit attachments to space id

* Update unittest

* Rebased to main branch

* Remove var_dump

* Add a shell scritp for automated import

* Fix and improve splitting output

* Rename method for namespace path

* Improve the splitting of the contents

* CC

* Fix attachment filenames

* Remove unused variable
* fix some unittests not cleaning up temp files

For mock DB setup switch to in-memory DB.

* fix PHPUnit warnings regarding deprecated method
Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
Co-authored-by: driedmueller <daniel.riedmueller@hallowelt.com>
* update README
* Implement parallel analyzer
* Parallel analyze step
* Update workspace db with sqlite file, fix tests
* Fix config option

* CC

* Update Extract.php

* Fix command analyze config

---------

Co-authored-by: Manuel Strehl <manuel.strehl@hallowelt.com>
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.

6 participants