Skip to content
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 main back into sprint-i18n in prep for big merge #207

Closed
wants to merge 8 commits into from

Conversation

gneissone
Copy link
Member

This will bring the sprint branch back up to speed with the main branch. We are targeting Monday to merge sprint-i18n back into main.

@awoods @wwelling @vivo-project/vivo-committers

gneissone and others added 8 commits March 21, 2020 19:15
[VIVO-1756] - Make data property richtext editor option selectable from UI
* Better error handling when reasoner disabled

* Change reasoner error log message to debug

* Extend reasoner status error handling

* Improve reasoner error log message and extend to JenaAdminActions

* Bump up log level for admin action to 'warn' and edit admin panel error message
Resolves: https://jira.lyrasis.org/browse/VIVO-1761

Co-authored-by: Andrew Woods <awoods@duraspace.org>
* Add download option to SPARQL Query page

* Set SPARQL query results content type even if downloading

* Address pull request comments
Related to: https://jira.lyrasis.org/browse/VIVO-1943

Co-authored-by: Andrew Woods <awoods@duraspace.org>
@awoods awoods mentioned this pull request Feb 3, 2021
@gneissone
Copy link
Member Author

Superseded by #208

@gneissone gneissone closed this Feb 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants