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.

Sign up for GitHub

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

Jump to bottom

Sprint i18n main #208

Merged
merged 10 commits into from
Feb 3, 2021
Merged

Sprint i18n main #208

merged 10 commits into from
Feb 3, 2021

Conversation

awoods
Copy link
Member

@awoods awoods commented Feb 3, 2021

Refresh of the sprint-i18n branch with updates from main.

Supersedes: #207

gneissone and others added 9 commits March 21, 2020 19:15
@gneissone
Make data property richtext editor option selectable from UI
4efe43c
@roflinn
Merge pull request vivo-project#138 from vivo-project/bugfix/VIVO-1756
7981d24 
[VIVO-1756] - Make data property richtext editor option selectable from UI
@gneissone
[VIVO-1755] - Better error handling when reasoner disabled (vivo-proj…
edef930 
…ect#137)

* 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
Change Model writer lang from "N3-PP" to "N3" (vivo-project#149)
6d30a0f 
Resolves: https://jira.lyrasis.org/browse/VIVO-1761

Co-authored-by: Andrew Woods <awoods@duraspace.org>
@gneissone
[VIVO-1851] - Add 'remove' option to named graph management page (viv…
42c69ef 
…o-project#162)

* Add 'remove' option to named graph management page

Resolves: https://jira.lyrasis.org/browse/VIVO-1851
@gneissone
[VIVO-1872] - Add download option to SPARQL Query page (vivo-project#164
e198fce 
)

* Add download option to SPARQL Query page

* Set SPARQL query results content type even if downloading

* Address pull request comments
@gneissone
Adjust SPARQL node logic to add datatypes to literals only if lacking…
1194134 
… a language tag (vivo-project#175)
Upgrade Jena version to 3.16.0 (vivo-project#196)
936305b 
Related to: https://jira.lyrasis.org/browse/VIVO-1943

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Merge branch 'main' into sprint-i18n-main
73cc117
@gneissone gneissone mentioned this pull request Feb 3, 2021
Closed
@gneissone gneissone self-requested a review February 3, 2021 22:33
gneissone
gneissone approved these changes Feb 3, 2021
View reviewed changes
Copy link
Member

@gneissone gneissone left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, though I wouldn't mind if the conflict resolution included removing some of the additional comments in the Java code that I feel don't provide any meaningful context (or adding to the comments so they do).

@gneissone gneissone merged commit 2621bc4 into vivo-project:sprint-i18n Feb 3, 2021
@awoods awoods deleted the sprint-i18n-main branch February 3, 2021 23:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gneissone gneissone gneissone approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@awoods @gneissone @roflinn