Commit graph

74 commits

Author SHA1 Message Date
brianjlowe
9635331b17 Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6 2013-10-31 10:46:54 -04:00
brianjlowe
1edcd06c1c adding "base root" annotation for VCard properties 2013-10-31 10:46:17 -04:00
tworrall
239d075127 VIVO-425, VIVO-422 and VIVO-424 2013-10-30 16:19:30 -04:00
tworrall
ace38832fe list view updates 2013-10-29 14:47:41 -04:00
tworrall
cb611da8ad issued credential was using dateTimeValue not dateIssued; also property config changes for VIVO-408 2013-10-24 17:18:13 -04:00
tworrall
ae80d6c63d miscellaneous cleanup but includes a fix for VIVO-404 2013-10-24 13:16:26 -04:00
tworrall
55670d67dd VIVO-386 and VIVO-385 2013-10-21 15:16:44 -04:00
tworrall
3df439c4a7 VIVO-375: new custom form, list view etc for ISsuedCredential 2013-10-18 09:58:37 -04:00
brianjlowe
032bb72bf9 deleting junk property config 2013-10-17 12:00:30 -04:00
brianjlowe
d9340bd55d minor property cleanup 2013-10-17 11:30:16 -04:00
brianjlowe
42e765f890 VIVO-369 and related property and individual visibility cleanup 2013-10-16 14:12:32 -04:00
tworrall
79347ad2ad miscellaneous clean up of minor display issues 2013-10-15 11:55:48 -04:00
tworrall
f3249ac6f2 VIVO-360, VIVO-359 and VIVO-345 2013-10-14 16:26:46 -04:00
tworrall
5cd482d6df VIVO-313: vcards for organizations 2013-10-11 14:35:15 -04:00
tworrall
0f3a4653ab VIVO-341: new custom form et all for preferred title 2013-10-10 14:51:18 -04:00
tworrall
db6e2dd358 VIVO-340 new custom form et al for advisee in and a refactored form for the advisor side 2013-10-10 10:14:55 -04:00
tworrall
58bb33c5f7 VIVO-112 more updates 2013-10-04 12:42:55 -04:00
tworrall
791db61269 VIVO-112 ongoing updates and VIVO-256 ORCID iD changes 2013-10-03 13:13:49 -04:00
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