tworrall
|
7f8c7bfff8
|
VIVO-112: and the beat goes on...
|
2013-10-01 16:46:13 -04:00 |
|
tworrall
|
83b3f755d5
|
VIVO-285: visualization updates for ISF
|
2013-09-30 09:30:34 -04:00 |
|
tworrall
|
fca87953d2
|
VIVO-112
|
2013-09-23 09:04:22 -04:00 |
|
tworrall
|
c5d0bc21e8
|
VIVO-112: ISF changes relating to vcard classes
|
2013-09-18 11:33:31 -04:00 |
|
tworrall
|
e05f5d6fb4
|
VIVO-112: ISF updates for advising relationship plus a couple of fixes
|
2013-09-11 15:50:15 -04:00 |
|
brianjlowe
|
5c14c1355d
|
Merge commit '69a45e573a0bae0dde8f661b8b1d7b6c2122366e' into dev-isf
Conflicts:
productMods/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl
productMods/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl
productMods/WEB-INF/filegraph/tbox/scires-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-core-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-event-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl
productMods/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/geopolitical.tbox.ver1.1-11-18-11.owl
productMods/WEB-INF/ontologies/update/oldVersion/isDefinedBy-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/scires-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-bibo-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-c4o-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-core-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcelements-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-dcterms-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-event-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-fabio-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-foaf-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-pws-1.5.owl
productMods/WEB-INF/ontologies/update/oldVersion/vivo-skos-1.5.owl
productMods/templates/freemarker/body/partials/individual/individual-positions.ftl
rdf/abox/filegraph/us-states.rdf
rdf/tbox/filegraph/geopolitical.tbox.ver1.1-11-18-11.owl
rdf/tbox/filegraph/isDefinedBy-1.5.owl
rdf/tbox/filegraph/scires-1.5.owl
rdf/tbox/filegraph/vivo-bibo-1.5.owl
rdf/tbox/filegraph/vivo-c4o-1.5.owl
rdf/tbox/filegraph/vivo-core-1.5.owl
rdf/tbox/filegraph/vivo-dcelements-1.5.owl
rdf/tbox/filegraph/vivo-dcterms-1.5.owl
rdf/tbox/filegraph/vivo-event-1.5.owl
rdf/tbox/filegraph/vivo-fabio-1.5.owl
rdf/tbox/filegraph/vivo-foaf-1.5.owl
rdf/tbox/filegraph/vivo-pws-1.5.owl
rdf/tbox/filegraph/vivo-skos-1.5.owl
|
2013-09-10 09:09:42 -04:00 |
|