Resolve merge conflicts #3
Open
Conversation
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
[VIVO-1592] Remove embedded Solr
Update default startup_listeners.txt for ElasticSearch
…anyURI and begin with http (vivo-project#94) Related to: https://jira.duraspace.org/browse/VIVO-1619 * weblinks for dataprops of range URI * addressed issues identified by Benjamin and Graham * dependent on Vitro Pull 101
…ationships (vivo-project#117) Resolves: https://jira.duraspace.org/browse/VIVO-1671 * Restrict context node labels added to search index to relationships
[VIVO-1677] Change legacy Google Maps link to use https
… equivalent (vivo-project#96) * Update listViewConfig-default.xml * 1641 repalce localname * [VIVO-1641] REPLACE jena afn with cross-platform regex Resolves https://jira.duraspace.org/browse/VIVO-1641
Update sprint-search to current develop branch
Click on the DOI badge to visit the Zenodo community collection archive for VIVO
…ject#126) * Remove trailing whitespace throughout project Resolves: https://jira.duraspace.org/browse/VIVO-1690 ** Along with: vivo-project/Vitro#117
…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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 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.
while hopefully retaining all the real changes.
You can compare the branch I'm proposing vs the current VIVO develop branch here: https://github.com/vivo-project/VIVO/compare/develop...gneissone:feature/VIVO-1675?expand=1