Commit graph

768 commits

Author SHA1 Message Date
hudajkhan
984e2f6f4c updates for label, new individual form, external vocab search 2013-10-02 14:56:58 -04:00
tworrall
83b3f755d5 VIVO-285: visualization updates for ISF 2013-09-30 09:30:34 -04:00
hudajkhan
b211b3ecef updates for label management 2013-09-26 13:58:12 -04:00
tworrall
b67e60bfb3 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-09-25 17:09:02 -04:00
tworrall
50c53a62e6 VIVO-112: and the slog continues... 2013-09-25 17:08:41 -04:00
hudajkhan
91fd8a4c1b updates for concepts and labels 2013-09-24 13:44:58 -04:00
brianjlowe
213f8ffd91 Merge remote-tracking branch 'origin/develop' into dev-isf 2013-09-23 16:05:13 -04:00
tworrall
fca87953d2 VIVO-112 2013-09-23 09:04:22 -04:00
brianjlowe
4047b4e8a9 data migration work 2013-09-20 15:42:17 -04:00
tworrall
c5d0bc21e8 VIVO-112: ISF changes relating to vcard classes 2013-09-18 11:33:31 -04:00
hudajkhan
ba1c6c7075 updates for concept search service, adding LCSH search capability 2013-09-16 14:02:47 -04:00
tworrall
e05f5d6fb4 VIVO-112: ISF updates for advising relationship plus a couple of fixes 2013-09-11 15:50:15 -04:00
tworrall
fbf2c4b651 VIVO-112: more updates for educational training and a change for organizationHasPositionHistory 2013-09-10 11:33:20 -04:00
brianjlowe
5c14c1355d Merge commit '69a45e573a' 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
tworrall
15168eb8ea VIVO-112: updates for educational training and awards 2013-09-06 17:02:43 -04:00
hudajkhan
a9ebf8f94b updates for concept search and label management 2013-09-05 15:45:49 -04:00
hudajkhan
419af234c4 updates for label addition as well as beginning changes for concepts search service 2013-09-03 15:32:51 -04:00
tworrall
59431742e1 VIVO-112: another round of updates to support the ISF changes 2013-08-28 16:58:02 -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
hudajkhan
4b52ccd687 updates to remove debugging statements, etc. 2013-08-13 15:26:57 -04:00
hudajkhan
6ea7d9ef37 adding licence to classes, removing sparql feed related classes 2013-08-13 12:23:49 -04:00
hudajkhan
ad0ae3c09a updates for semantic services, temporarily commenting out concept semantic type which is still in progress 2013-08-12 13:09:04 -04:00
hudajkhan
0f64658c5e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-08 12:25:31 -04:00
hudajkhan
2ea474b6ef External vocabulary service and integration of Agrovoc with work beginning for applying concept semantic type to UMLS concepts. 2013-08-07 16:08:11 -04:00
brianjlowe
afedf991f2 in-process conversion of position rendering to ISF 2013-08-06 16:23:44 -04:00
tworrall
be11fc589f VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before 2013-08-05 14:57:59 -04:00
tworrall
57c694abee add links to wiki pages for two runtime properties; fixed an incorrect href attribute 2013-07-09 09:38:30 -04:00
tworrall
7bbc249047 some home page map cleanup, standardization 2013-07-03 14:00:56 -04:00
Jim Blake
cb757d82da Merge pull request #5 from vivo-project/feature/search-download
Added a new field email to IndividualSearchResults and a modification of...
2013-06-28 12:16:01 -07:00
tworrall
c3bdcb6676 minor change, renamed a variable 2013-06-28 10:15:32 -04:00
tworrall
93e2b107bf fixed an i18n string 2013-06-25 13:56:17 -04:00
tworrall
d9de65e4c8 only show the view active grants link on academic department pages if the department has any active grants 2013-06-25 11:07:16 -04:00
tworrall
7a9d46e130 significant changes for VIVO-131. See Jira comment for more details 2013-06-20 16:02:10 -04:00
tworrall
dd30f287b0 modified some image based tooltips to support i18n 2013-06-14 16:10:15 -04:00
tworrall
3942b2923c fix for vivo-127 2013-06-12 16:05:16 -04:00
tworrall
66992942b6 i18n updates to javascript files and related templates 2013-06-11 12:23:32 -04:00
tworrall
2c49931672 internationalization changes for java script files 2013-06-07 11:59:14 -04:00
tworrall
1dde11c581 VIVO-123 - handle malformed data more gracefully on manage pubs page 2013-06-06 15:44:16 -04:00
Stephen V. Williams
1bae4ff677 changed order to have name first in csv and added the xmlResults from vitro with VIVO specific items 2013-05-31 12:21:02 -06:00
tworrall
fe1b52ab49 more template updates for i18n 2013-05-31 11:56:18 -04:00
Stephen V. Williams
06ca894546 Added a new field email to IndividualSearchResults and a modification of the csv-results for VIVO that includes email and preferred title where available 2013-05-31 09:09:33 -06:00
tworrall
27b6c51ce0 added time indicator wheel to faculty section on home page 2013-05-14 12:51:50 -04:00
tworrall
a618253d0c more i18n template changes 2013-05-14 12:23:24 -04:00
tworrall
0ba1c16f56 corrected plural display error redux 2013-05-13 15:31:11 -04:00