Skip to content

Resolve merge conflicts #3

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

Open
gneissone wants to merge 31 commits into
base: fix/VIVO-1675
Choose a base branch
from
Open

Resolve merge conflicts #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
c37a465
Remove embedded Solr
Sep 18, 2018
c332e3e
Update default startup_listeners.txt for ElasticSearch
Sep 26, 2018
e22b1c0
Merge pull request #83 from awoods/vivo-1592
roflinn Nov 3, 2018
50f3f6a
Merge pull request #92 from awoods/vivo-1600
roflinn Nov 3, 2018
87c98fd
[VIVO-1619] Create weblinks for data properties that have a range of …
delsborg Jan 8, 2019
3da53e2
Replace antrun-plugin <tasks> with <target> in pom.xml files
gneissone Dec 8, 2018
ba2ee23
[VIVO-1671] Restrict context node labels added to search index to rel…
gneissone Jan 25, 2019
490ddad
Fix for Plum Analytics badge on wrong publications
grahamtriggs Feb 8, 2019
8c7986d
[VIVO-1672] Fix NullPointer in visualisations (#118)
grahamtriggs Feb 12, 2019
c827f65
Change legacy Google Maps link to use https
gneissone Feb 21, 2019
5dfa919
Merge pull request #121 from vivo-project/bugfix/VIVO-1677
roflinn Feb 22, 2019
8511073
[VIVO-1641] Replace afn:localname / afn:namespace with cross-platform…
alessandroGalasso Mar 20, 2019
adfbe22
Remove embedded Solr
Sep 18, 2018
f6eb0eb
Update default startup_listeners.txt for ElasticSearch
Sep 26, 2018
11eaa11
Merge pull request #124 from awoods/sprint-search
hudajkhan Apr 3, 2019
9f34f5e
Add Zenodo DOI
mconlon17 Apr 14, 2019
48dcf87
Update README.md
mconlon17 Apr 14, 2019
87092ce
[VIVO-1690] - Remove trailing whitespace throughout project (#126)
gneissone May 3, 2019
06726e0
[VIVO-1656] Extension mechansim for passing properties to templates (…
grahamtriggs Jun 7, 2019
92d0fe9
Merge branch 'sprint-search' into dev-search
EDemerzel Jun 21, 2019
27cb119
fixing merge error
EDemerzel Jun 24, 2019
1e487a8
Set Tenderfoot pub chart height (#125)
gneissone Jul 9, 2019
abc152c
Paper revision (#131)
hauschke Jul 13, 2019
3d08253
Update paper.bib (#132)
hauschke Jul 15, 2019
05ba04d
Update paper.bib (#133)
hauschke Jul 15, 2019
cfd154b
Merge pull request #135 from vivo-project/dev-search
brianjlowe Jul 24, 2019
89bdf16
Update paper.bib (#134)
arfon Jul 24, 2019
c0ad14b
Create initial format style enforcement (#127)
Jul 25, 2019
0a08c28
VIVO-1614 - Update to allow the TPF API to be toggled via the runtime…
roflinn Aug 2, 2019
f597b7e
[VIVO-1415] Add publication claiming from PubMed and CrossRef (#129)
grahamtriggs Aug 8, 2019
27818a3
Resolve merge conflicts
gneissone Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/build.properties
/runtime.properties
/ontology/public/catalog-v0001.xml
settings.xml

rdf/auth/firsttime/test-user-model.owl
utilities/solrtester/.work
Expand All @@ -11,8 +12,8 @@ utilities/rdbmigration/.work
**/.idea
**/*.iml
**/target

**/overlays
*~

# Eclipse artifacts
**/.settings
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# VIVO: Connect, Share, Discover

[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO)
[![Build Status](https://travis-ci.org/vivo-project/VIVO.png?branch=develop)](https://travis-ci.org/vivo-project/VIVO) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2639714.svg)](https://doi.org/10.5281/zenodo.2639713)

VIVO is an open source semantic web tool for research discovery -- finding people and the research they do.

Expand Down
Loading