Commit graph

5214 commits

Author SHA1 Message Date
102de0c3fd Templates and SPARQL requests for rubrics, elenph excerpts and articles 2021-10-14 15:32:41 +02:00
Dragan Ivanovic
47a221b866 Update issue templates 2021-10-07 16:33:04 +02:00
Ralph O'Flinn
abd40c25f5
updates to outdated URLs and branch names (#251) (#252)
updates to outdated URLs and branch names (typically master -> main)
2021-10-06 06:38:19 -05:00
Dragan Ivanovic
7046bdfad7 Update issue templates 2021-10-06 12:54:10 +02:00
Dragan Ivanovic
657b6922f9 Update issue templates 2021-10-06 12:52:47 +02:00
Ralph O'Flinn
9f6b545b84 Merge branch 'rel-1.12.0-RC' into main 2021-07-21 07:09:36 -05:00
Ralph O'Flinn
584b34c682 [maven-scm-plugin] prepare development vivo-1.12.1-SNAPSHOT-SNAPSHOT 2021-06-23 00:19:07 -05:00
Ralph O'Flinn
9b0de5f3d4 [maven-scm-plugin] prepare release vivo-1.12.0 2021-06-23 00:16:40 -05:00
Brian Lowe
09e4ea732a
Add self-activating profiles for building Vitro-languages and VIVO-l… (#245)
* Add self-activating profiles for compiling Vitro-languages and VIVO-languages in place of i18n profile

* Remove trailing whitespace
2021-06-22 13:48:05 -05:00
Brian Lowe
109b5a4fe1
Update version numbers in pom.xmls (#244)
* Update version numbers in pom.xmls

* Restore -SNAPSHOT
2021-06-21 04:11:24 -05:00
e1dc5c9775
Merge pull request #240 from brianjlowe/issue/VIVO-1983
[VIVO-1983] Limit label management values to current locale
2021-06-17 23:33:40 +02:00
Brian Lowe
3de9a03ab5 Update comment 2021-06-16 21:54:48 +03:00
Brian Lowe
f4f6dddb11 Retrieve locales used in label statements instead of only selectable locales 2021-06-16 21:43:30 +03:00
a9a095397e
Merge pull request #243 from brianjlowe/issue/VIVO-1996
[VIVO-1996] Retain language tags in manage publications query results to allow for language filtering
2021-06-16 17:07:55 +02:00
Brian Lowe
603e7f6bc8
Do not offer UMLS vocabulary in interface if umls.properties is absent. (#241)
* Replace hardcoded en locale with current locale in lang attributes

* Do not offer UMLS vocabulary service in interface if umls.properties is absent
2021-06-09 08:02:46 -06:00
Michel Héon
e3027841aa
integrate in a single Maven call the compilation and installation of (#242)
Integrate in a single Maven call the compilation and installation of VIVO-Languages and Vitro-Languages in VIVO.
2021-06-04 17:17:17 +03:00
Brian Lowe
dc56107d4d Pass languageCount value to label macro 2021-06-04 17:00:26 +03:00
Brian Lowe
49eedfe0a0 Retain language tags in manage publication query results to allow for language filtering 2021-06-03 19:40:07 +03:00
Brian Lowe
43289ba71e Get language-aware results for existing labels in ManageLabelsForPersonGenerator 2021-05-28 15:52:16 +03:00
Brian Lowe
9652127081 Merge branch 'rel-1.12.0-RC' of https://github.com/vivo-project/VIVO into rel-1.12.0-alpha 2021-05-27 16:20:08 +03:00
Brian Lowe
631986a2d5
Issue/vivo 1981 (#239)
* Replace hardcoded en locale with current locale in lang attributes

* Update README with current wiki link; add details to Docker Compose installation instructino.
2021-05-11 10:07:53 -05:00
Ben
5d257cae6b
[VIVO-1982] - Set default email params to blank (#238)
* Set default email params to blank

* Comment out email settings
2021-05-07 11:46:57 +03:00
Brian Lowe
8b161f948e
Add usePreciseSubqueries property to example.runtime.properties (#233) 2021-05-05 10:36:46 -06:00
Brian Lowe
fe764ded51 Merge branch 'rel-1.12.0-alpha' of https://github.com/vivo-project/VIVO into rel-1.12.0-alpha 2021-05-03 19:35:17 +03:00
Brian Lowe
fe1498319a
Add note to runtime.properties that TPF should not be used if VIVO contains restricted data. (#236) 2021-04-27 10:43:59 -06:00
Brian Lowe
f4d187a601
Allow 'create new' for vivo:governingAuthorityFor. Resolve https://jira.lyrasis.org/browse/VIVO-1820 (#234) 2021-04-21 12:38:32 -05:00
Brian Lowe
29728b3b40
Add additional URI finder that will reindex a person if its associate… (#227)
* Add additional URI finder that will reindex a person if its associated title or email resource is deleted altogether.

* Remove redundant identical query; eliminate unused prefix.
2021-04-21 11:54:23 -05:00
Brian Lowe
250566446f
Replace hardcoded en locale with current locale in lang attributes (#237) 2021-04-21 11:53:35 -05:00
Brian Lowe
2be59bbe02
Fix issues preventing rendering and functioning of temporal graph. Resolve https://jira.lyrasis.org/browse/VIVO-1978 (#235) 2021-04-21 10:14:16 -05:00
Brian Lowe
d72472824a Replace hardcoded en locale with current locale in lang attributes 2021-04-21 17:19:44 +03:00
Brian Lowe
2fa7cce5c7
Move non-language-specific Vitro annotations to VIVO tbox firsttime d… (#225)
* Move non-language-specific Vitro annotations to VIVO tbox firsttime directory.

* Update tbox/firsttime readme to document difference between vitroAnnotations.n3 and initialTBoxAnnotations.n3
2021-03-30 15:05:11 -05:00
Brian Lowe
fe09808b1b
Retrieve sitemap profile URLs only after consuming result set in order to avoid transaction errors with TDB. Resolve https://jira.lyrasis.org/browse/VIVO-1910 (#231) 2021-03-30 09:41:24 -06:00
Ralph O'Flinn
d00d7de585
Revert deployment strategy (#230)
* revert deployment changes

* update docker and compose for previous deployment

* minor readme update

* use package instead of install

this avoids exploding war file in tomcat but seems to be missing overlays for VIVO theme

* test docker workflow

* test deploy workflow

* add package profile for home

* skip deploy for installer

* skip installer by profile

* update workflows

* minor readme update

* use app-name for vivo log file name

* Update log4j.properties

Co-authored-by: William Welling <wwelling@library.tamu.edu>
2021-03-24 01:46:24 -05:00
Ralph O'Flinn
1dd2851e45
Revert "revert deployment changes (#228)" (#229)
This reverts commit 7773db3394.
2021-03-24 01:41:41 -05:00
William Welling
7773db3394
revert deployment changes (#228)
* revert deployment changes

* update docker and compose for previous deployment

* minor readme update

* use package instead of install

this avoids exploding war file in tomcat but seems to be missing overlays for VIVO theme

* test docker workflow

* test deploy workflow

* add package profile for home

* skip deploy for installer

* skip installer by profile

* update workflows

* minor readme update

* use app-name for vivo log file name

* Update log4j.properties
2021-03-22 20:37:13 +02:00
hauschke
47fb4fdc05
Update LICENSE (#226)
Update license year to 2021.
2021-03-12 16:31:39 +02:00
dependabot[bot]
fdda5f0774
Bump junit from 4.11 to 4.13.1 in /api (#195)
Bumps [junit](https://github.com/junit-team/junit4) from 4.11 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.11.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.11...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-18 10:11:44 -06:00
dependabot[bot]
0d5049f3b6
Bump junit from 4.12 to 4.13.1 in /selenium (#196)
Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-02-18 10:11:14 -06:00
William Welling
880ac5b797
VIVO-1963: Initial docker compose (#223)
* initial docker compose

* for docker volume use direct tdb filemode

* runtime properties with solr url configured

* move gitattributes to root to ensure scripts stay valid

* fix VIVO dockerfile command permissions

* use public vivoweb/vivo-solr image

* start script improvements

* pass docker compose env to containers

* generate digest.md5 of existing VIVO home

* add initial readme

* reset docker compose env defaults

* minor readme updates
2021-02-18 10:07:19 -06:00
Andrew Woods
5f6cabc42a
Update example.runtime.properties (#222)
* Update example.runtime.properties

Resolves: https://jira.lyrasis.org/browse/VIVO-1930

Co-authored-by: gneissone <mbgross@wustl.edu>
Co-authored-by: Andrew Woods <awoods@duraspace.org>
2021-02-12 16:42:58 +02:00
gneissone
f15eec19e0 Bugfix for type restriction in search index config 2021-02-11 09:00:22 -05:00
gneissone
2122254cdb Update to google chart library loads 2021-02-10 15:12:37 -05:00
William Welling
a9ce8c7de8
VIVO-1961: GitHub Action to Publish Docker Image (#220)
* simple dockerfile and image publish workflow
* upgrade to v2 of build push action
* provide context and explicit docker file

Resolves: https://jira.lyrasis.org/browse/VIVO-1961
2021-02-10 15:03:29 -05:00
Andrew Woods
268ffa1cd7
Sprint i18n with main (#215)
* Layer uqam updates onto master (minus trailing whitespace)

* Update AddOrganizerRoleToPersonGenerator.java

Removed extraneous whitespace

* My whitespace (#153)

* Update AddPublicationToPersonGenerator.java

* Removed extraneous whitespace AND move RootUserPolicy.java from VIVO to Vitro

* Fixed whitespace in: AddAttendeeRoleToPersonGenerator.java

* Fixed indentations for AddOutreachProviderRoleToPersonGenerator.java

* Fixed indentations

* Removed extraneous whitespace (#158)

* Removed extraneous whitespace

* Fix bug introduced in cleaning up whitespace

* Tagging UQAM comments with the following tags

-Add-Feature
-Optimization
-Linguistic-Management
-Bug-Correction

* Update AddReviewerRoleToPersonGenerator.java

* Added an internationalization correction to be considered in the vivo-i18n-core that was forgotten when sprint-i18n was created.

* Fix typo in AddReviewerRoleToPersonGenerator

Resolves: https://jira.lyrasis.org/browse/VIVO-1774

* Fix typo in AddOutreachProviderRoleToPersonGenerator

Resolves: https://jira.lyrasis.org/browse/VIVO-1775

* Include language dependencies in build all of the time (#168)

Move "LocaleSelectionSetup" higher in the startup list so that the Vitro:RDFFilesLoader has the locale info available on its startup

Part of resolution to: https://jira.lyrasis.org/browse/VIVO-1836

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Made modifications to publicationToPersonUtils.js so that multilangua… (#170)

* Made modifications to publicationToPersonUtils.js so that multilanguage support will not break the javascript functionalty.

Co-authored-by: root <root@vivo-development.hs-mittweida.de>

Resolves: https://jira.lyrasis.org/browse/VIVO-1739

* Feature language en_CA (#169)

* Changing ontology extensions for n3 & assigning a base IRI to each
ontology

Co-authored-by: michelheonuqam <heon.michel@uqam.ca>
Co-authored-by: michelheon <heon@videotorn.ca>

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1862

* i18n: title tag and headings in capability map are in english in french version (#173)

* added multi-language support for ticket VIVO-1846

* fixed swapped properties, added Capability map title to i18n

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1847

* Added i18n support for Capability Map control buttons, JIRA ticket VIVO-1846

* removed redundat files which are now available via Vitro- and VIVO-languages

* added i18n support for the capability map, ticket vivo-1892

* Revert non-function RDF changes (#180)

Related to: https://jira.lyrasis.org/browse/VIVO-1905

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Ensure 'other' in Individual->Teaching->advisees->type is translated

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1881

* [VIVO-1842] i18n: Added function js_string at i18n variables to handle quotes properly (#181)

* added js_string at i18n strings to handle quotes properly, ticket vivo-1842

Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1842

* replace static headings with i18n values (#183)

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1844

* added empty check for getCountry, fixing bug with spanish label (es), ticket vivo-1900 (#182)

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1900

* Issue/vivo 1908 (#185)

* Provide fallback language in language-filtered webpage SPARQL query and use existing RDFService-based filtering for ConstantFieldOptions

Resolves: https://jira.lyrasis.org/browse/VIVO-1906

* Fix bug of missing toString() (#187)

Related to: https://jira.lyrasis.org/browse/VIVO-1906

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* Remove files replicated in i18n (#186)

Related to: https://jira.lyrasis.org/browse/VIVO-1917

* removed redundant vitroAnnotations, now in VIVO-languages, ticket vivo-1821

* Removed key.png from the template and replaced it with css sprite and… (#184)

* Removed key.png from the template and replaced it with css sprite and descriptions in plain text.
* * adding height to background images, hopefully fixing issues

Partial resolution for: https://jira.lyrasis.org/browse/VIVO-1902

* [VIVO-1915] i18n - removing language select for label management for individuals (#190)

* removed the language select for managing multi language labels fpr individuals, ticket vivo-1915

* modified ManageLabelsForPersonGenerator so that you can only add an langauge label if it is not already set, ticket vivo-1915

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1915

* - added i18n() to hardcoded values

* added i18n support to person's domain in capability map, ticket 1867

* [VIVO-1946] - Update ResearcherID description in vivo.owl (#188)

* Update ResearcherID description in vivo.owl

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1946

* [VIVO-1936] i18n: updated the language comment in runtime.properties (#203)

Partial resolution of: https://jira.lyrasis.org/browse/VIVO-1936

Co-authored-by: Kampe <Benjamin.Kampe@tib.eu>

* [VIVO-1924] i18n: @en i18n properties are not loaded during first site startup. (#204)

* rearranged startup-listeners fixing bug with language files, ticket VIVO-1924

* Added a comment to prevent future bugs like this, ticket VIVO-1924

* fixed previous comment, ticket VIVO-1924

* Remove duplicate text from dropdown menus

* Minor checkstyle correction following: VIVO-1936 (#206)

Follow-on to: https://jira.lyrasis.org/browse/VIVO-1936

Co-authored-by: Andrew Woods <awoods@duraspace.org>

* follow-up on vivo-1936 - restore default values in example-settings.xml (#210)

Co-authored-by: gneissone <mbgross@wustl.edu>

* [VIVO-1798] - Internationalize first and last name validation (#207)

* Internationalize first and last name validation

Partial resolution to: https://jira.lyrasis.org/browse/VIVO-1798

* adding collections process terms (#165)

* adding collections process terms

No JIRA :(

* Non-functional change to comment in example.applicationSetup.n3

Related to: https://jira.lyrasis.org/browse/VIVO-1741

* Update orcidConfirm.ftl (#199)

Fix i18n property used on ORCID confirmation step 2 button.
Related to https://jira.lyrasis.org/browse/VIVO-1945

* Fix external AGROVOC service URL

* URL fix for LCSH service

* Remove unnecessary pom.xml 'profile'

- Also, uncomment language overlays
   - Noting that this is not actually necessary, as any 'war' Maven dependencies are automatically overlayed:
   - https://maven.apache.org/plugins/maven-war-plugin/overlays.html

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: Nicolas D <46490666+nicalico@users.noreply.github.com>
Co-authored-by: UQAM-VIVO <heon.michel@uqam.ca>
Co-authored-by: matthiasluehr <60263380+matthiasluehr@users.noreply.github.com>
Co-authored-by: Michel Heon <heon@videotron.ca>
Co-authored-by: dofeldsc <dofeldsc@uos.de>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: Brian Lowe <brianjlowe@gmail.com>
Co-authored-by: Matthias Lühr <luehr@hs-mittweida.de>
Co-authored-by: Ben <mbgross@wustl.edu>
Co-authored-by: Benjamin Kampe <benjamin@fehrmanns.net>
Co-authored-by: Kampe <Benjamin.Kampe@tib.eu>
Co-authored-by: Gross, Benjamin <benjamin.gross@clarivate.com>
Co-authored-by: diatomsRcool <annethessen@gmail.com>
Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>
2021-02-10 11:02:20 -06:00
William Welling
f97972e5aa
VIVO-1960: GitHub Actions Continued (#218)
* add build workflow
* remove travis
* remove unnecessary vitro cache
* update readme badge
* run tests during CI build
* build CI use java 11
* add repositories to distribution management
* deploy from main branch and update readme

Follow-on to: https://jira.lyrasis.org/browse/VIVO-1960
2021-02-09 17:46:21 -05:00
William Welling
6dbc31cc9d
VIVO-1960: GitHub Build Action (#217)
* add build workflow
* remove travis
* update readme badge

Partially resolves: https://jira.lyrasis.org/browse/VIVO-1960
2021-02-09 15:01:29 -05:00
Andrew Woods
01776ee692
Enable war deployment model (#197)
* Add 'home' files into build war artifact

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Disable copying exploded war to Tomcat dir

- hardcode vivo.all.log file name
- must now set system property: -Dvivo-dir=/opt/vivo/home/

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Ensure build does not remove and re-add VIVO_HOME/rdf

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Remove unnecessary profile from installer/pom.xml

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Rename example config files to have 'default' prefix

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* Require common properties to be in JNDI

Properties include:
- vitro/home
- vitro/appName
- vitro/rootUserAddress
- vitro/defaultNamespace

Related to: https://jira.lyrasis.org/browse/VIVO-1443

* VIVO-1443: app name (#2)

* Non-functional change to comment in example.applicationSetup.n3

Related to: https://jira.lyrasis.org/browse/VIVO-1741

* Update orcidConfirm.ftl (#199)

* remove example-settings.xml
* simplify war name and afford override during build
* default app name to vivo and pass into context.xml

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>

Co-authored-by: Andrew Woods <awoods@duraspace.org>
Co-authored-by: William Welling <wwelling@library.tamu.edu>
Co-authored-by: L.O <53535673+lb-ov@users.noreply.github.com>
2021-02-05 10:56:50 -06:00
L.O
c54f8a105b
Update orcidConfirm.ftl (#199)
Fix i18n property used on ORCID confirmation step 2 button.
Related to https://jira.lyrasis.org/browse/VIVO-1945
2021-01-06 22:31:09 +02:00
Andrew Woods
17dd020835 Non-functional change to comment in example.applicationSetup.n3
Related to: https://jira.lyrasis.org/browse/VIVO-1741
2020-09-30 17:56:58 -04:00
diatomsRcool
f585d90c0e
adding collections process terms (#165)
* adding collections process terms

No JIRA :(
2020-09-23 11:03:25 -04:00