Manifest merge update #36
Merged
Conversation
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
change refs to master branch to refs to main
had to manually include docs/.nojekyll and docs/index.html from manifest (2d) code
from the mainfesto/main side of the merge
the 'test' script still runs all tests including the 3d tests
|
This pull request is automatically built and testable in CodeSandbox. To see build info of the built libraries, click here or the icon next to each commit SHA. |
|
Everything built and tested fine with Voyager. @vincentmarchetti If everything is looking good with the X3DOM viewer, I'm happy to merge. |
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.
This is an extension of the merge performed via Pull Request 34. It merges 17 commits made in IIIF-Commons/manifesto main branch since the that previous merge was perfomed.
This merge also resolves some conflicts in the npm install by updating the the dependency versions according to the IIIF-Commons/manifesto repo, and resolves errors in auto-generating documentation.
At this merge
The package naming and version is still appropriate to our 3d fork. I think we would only need to adjust the package, version numbering, the readme,md file, and webpage references, to be an appropriate pull request to IIIF-Commons/manifesto