Resolve merge conflict#4
Open
gneissone wants to merge 20 commits into
Open
Conversation
[VIVO-1592] Remove embedded Solr
Update default startup_listeners.txt for ElasticSearch
Update sprint-search to current develop branch
…ivo-project#128) * [VIVO-1656] Extension mechansim for passing properties to templates for Individuals * [VIVO-1656] Extension mechansim for passing properties to templates for Individuals
# Conflicts: # installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties # webapp/src/main/webapp/WEB-INF/resources/startup_listeners.txt
* minor fix in Acknowledgement * Added references * Added 2 ORCIDs
Added dates to websites according the respective website, checked links, updated urldates, added "author = {VIVO Project}" to the references of "About Vitro" and "VIVO-ISF-Ontology", changes "Vivo-isf-ontology" to "VIVO-ISF-Ontology".
deleted comma
- All rules are initially suppressed Resolves: https://jira.duraspace.org/browse/VIVO-1692
….properties. (vivo-project#136) * Update to allow the TPF API to be toggled via the runtime.properties. Resolves: https://jira.duraspace.org/browse/VIVO-1614
…roject#129) * Claiming interface for DOI and PMID * Allow http://doi.org urls in the claim process * Make button i18n compliant * Check Editor already claimed, error for no citation, PUMCIDs fixed * Fixed gnarly DOI containing semi-colon (removed semi-colon as separator), match more DOI formats internally, improve AUTH restrictions * Add Wilma themes * Add permissions to allow proxy editors * Update DOI resolver URI for content negotiation * CSS changes to prevent layout problems in admin pages * Add selectable list of publication types on import Resolves to https://jira.duraspace.org/browse/VIVO-1415
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
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.
Compare result w/ VIVO develop branch: https://github.com/vivo-project/VIVO/compare/develop...gneissone:fix/vivo-1670?expand=1