tworrall
7f8c7bfff8
VIVO-112: and the beat goes on...
2013-10-01 16:46:13 -04:00
Brian Caruso
b82429924e
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
2013-09-30 16:31:11 -04:00
Brian Caruso
2a239e87a3
Moving files to deal with vivo overrides. Adding permissions to pageList. VIVO-63
2013-09-30 16:31:04 -04:00
tworrall
83b3f755d5
VIVO-285: visualization updates for ISF
2013-09-30 09:30:34 -04:00
brianjlowe
59686f8ce9
removing extraneous file
2013-09-26 13:02:42 -04:00
tworrall
fca87953d2
VIVO-112
2013-09-23 09:04:22 -04:00
brianjlowe
6d77fc7871
various and sundry data migration changes
2013-09-19 14:18:49 -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
c367ce4fd6
moving PropertyConfigSupp.n3 to the right directory
2013-09-10 10:24:28 -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
j2blake
e3227af798
VIVO-262 Add languages to VIVO at build time.
...
Move the language-specific files out of the default build area. Add a build property that will cause the selected language(s) to be copied into the build area.
2013-09-09 12:23:36 -04:00
Stephen V. Williams
4c99e948f4
Merge branch 'develop' into feature/concept2departments
2013-08-26 09:41:59 -06:00
Stephen V. Williams
957b6345e7
Merge branch 'develop' of github.com:vivo-project/VIVO into develop
2013-08-26 09:41:23 -06:00
Stephen V. Williams
2e9e64ebe9
fix links to use context appropriate title instead of 'research area' and 'organization'
2013-08-26 09:40:44 -06:00
tworrall
621be26e73
VIVO-263: corrected counts on map display and updated us-states.rdf file to include relationship between states and the US.
2013-08-23 16:27:10 -04:00
Stephen V. Williams
27a1c1a542
add reverse links to on the details pages for dept-subjArea and subjArea-dept
2013-08-21 20:47:21 -06:00
Stephen V. Williams
76238887b1
added departments to concept page based on researcher selecting concept as research area
...
* 4 new files for handling the new linkage (individual--skos-concept.ftl, individual-affiliated-departments.ftl, individual-affiliated-dept-details.ftl, vivoConceptDataGetters.n3)
* added invdividual--skos-concept.ftl to the skos:Concept definition in vivo-core-1.5-annotations.rdf
* added i18n entries for the new ftl pages
2013-08-21 16:48:01 -06:00
j2blake
5f7bbc6799
VIVO-248 Use /rdf instead of /rdffiles
2013-08-21 15:55:07 -04:00
