search

slub / dfg-viewer

The DFG Viewer is a free web service for browsing digitized books from remote library repositories in a rich and dynamic environment.
https://dfg-viewer.de
GNU General Public License v3.0
29 stars 26 forks source link

Support for musical sources (and prototype annotations) #230

Closed haogatyp closed 5 days ago

sebastian-meyer commented 11 months ago

@haogatyp Please resolve the merge conflicts.

stweil commented 3 months ago

@haogatyp Please resolve the merge conflicts.

There is again a merge conflict to be solved.

stweil commented 2 months ago

There is again a merge conflict to be solved.

In addition there are several issues reported by Codacy which I think could be fixed.

chrizzor commented 1 week ago

It looks like Thomas Jung @gnuj has set the version of grunt in the package.json to ^1.6. The installed version therefore does not match the specification in the package-lock.json file. Perhaps Thomas Jung still needs to commit the lock file? I'm not sure.

sebastian-meyer commented 1 week ago

@beatrycze-volk From my point of view, this is ready for merging. The corresponding PR https://github.com/kitodo/kitodo-presentation/pull/1281 has been merged.

This can be tested at https://test.dfg-viewer.de

The remaining Grunt issue should be easily fixed by running npm update once. Unfortunately I can't do that because I don't have access to the source branch.

gnuj commented 5 days ago

The remaining Grunt issue should be easily fixed by running npm update once. Unfortunately I can't do that because I don't have access to the source branch.

Thats completely correct. This will probably be significantly less work than if I start a complete new branch including a merge request. If this is important for organisational reasons just hit me up.

sebastian-meyer commented 5 days ago

Since we all can't access the source branch (and @chrizzor isn't available for the next two months), I propose merging this, then immediately run npm update and push the changes again. Is that OK, @beatrycze-volk?

beatrycze-volk commented 5 days ago

Hi @sebastian-meyer, I currently have no access to my computer so please feel free to make it :)

sebastian-meyer commented 5 days ago

OK, you are the release manager, I'll do as you say! ;o)

stweil commented 5 days ago

I'm afraid that Resources/Public/Css/allStyles.css.map should not have been added. Pull request #294 removes it again.

stweil commented 5 days ago

For future contributions it would be good to set a valid author name.