Commit graph

375 commits

Author SHA1 Message Date
brianjlowe
fd8de955f5 awardedDegree migration 2013-09-12 10:44:03 -04:00
brianjlowe
745a4a26e8 VIVO-256 migrate orcid to URI reference 2013-09-11 10:17:32 -04:00
brianjlowe
c367ce4fd6 moving PropertyConfigSupp.n3 to the right directory 2013-09-10 10:24:28 -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
brianjlowe
40cd735752 last of the vcard migration (I hope) 2013-09-09 11:49:23 -04:00
tworrall
aeac0411d4 Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf 2013-09-06 17:03:31 -04:00
tworrall
15168eb8ea VIVO-112: updates for educational training and awards 2013-09-06 17:02:43 -04:00
brianjlowe
1c60c24002 VCard migration 2013-09-06 16:41:15 -04:00
brianjlowe
5d2e44c08f property link suppression annotations 2013-09-04 10:01:11 -04:00
tworrall
cae4fe03c1 VIVO-112: more changes for role related forms and addAuthorToPub 2013-08-29 12:35:35 -04:00
tworrall
59431742e1 VIVO-112: another round of updates to support the ISF changes 2013-08-28 16:58:02 -04:00
tworrall
027f9b6966 VIVO-112: updates to property config and a java class to correct property names 2013-08-27 15:38:52 -04:00
tworrall
35d136fec3 VIVO-112 ISF changes relating to custom forms and list views 2013-08-26 16:58:49 -04:00
brianjlowe
43d92a8cd8 VCard migration (in progress) 2013-08-23 11:03:04 -04:00
brianjlowe
7eb6f92d69 improvements to ISF filegraphs 2013-08-21 11:44:16 -04:00
j2blake
37c35468ca VIVO-248 Move more RDF files into the home directory
Files for initializing the display, displayTbox and displayDisplay models. Also restructure the RDFFilesLoader.
2013-08-21 11:27:41 -04:00
j2blake
71ce2beffc VIVO-248 Move more RDF files into the home directory
Files for initializing the TBOX, ABOX, ApplicationMetadata and UserAccounts models.
2013-08-20 17:14:09 -04:00
brianjlowe
12b384f5eb changing bearerOf/inheresIn in diff.tab.txt to use the RO URIs instead of BFO2 URIs 2013-08-20 16:54:09 -04:00
tworrall
e5df3b70ba another minor correction to the text 2013-08-19 14:52:03 -04:00
brianjlowe
ed71f74e10 continued work on ISF conversion and data migration 2013-08-09 16:24:08 -04:00
tworrall
6950aab59c fixed a typo 2013-08-07 15:02:42 -04:00
brianjlowe
c162d3d84b position form updates for ISF 2013-08-06 16:55:15 -04:00
brianjlowe
afedf991f2 in-process conversion of position rendering to ISF 2013-08-06 16:23:44 -04:00
brianjlowe
f30917d357 Merge remote-tracking branch 'origin/develop' into dev-isf 2013-08-06 11:06:35 -04:00
brianjlowe
4598aae578 work in progress on data migration and related changes for ISF properties 2013-08-05 16:46:25 -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
brianjlowe
5fad9b85fa initial example file of application configuration for property/class combination 2013-07-24 17:04:30 -04:00
tworrall
f2ce218a87 VIVO-105: English and Spanish versions of the about page 2013-07-22 16:19:40 -04:00
tworrall
c3bdcb6676 minor change, renamed a variable 2013-06-28 10:15:32 -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
883cbea941 VIVO-105 along with additions to the upgrade doc 2013-06-24 15:48:19 -04:00
j2blake
c5acf46316 VIVO-125 Create more "Google Spanish" labels
Add more labels by changing the filter in the label_stripper/label_inserter scripts. Improve the structure of the scripts to use an external filter.
2013-06-21 14:58:28 -04:00
tworrall
7a9d46e130 significant changes for VIVO-131. See Jira comment for more details 2013-06-20 16:02:10 -04:00
j2blake
b8308baefc VIVO-125 Continue to develop the googleSpanish text.
Bring all_es.properties up to par with all.properties, in both Vitro and VIVO/Wilma
Add labels for class groups, property groups, menu pages.
2013-06-11 16:34:20 -04:00
j2blake
e937d9d0a0 VIVO-84 Remove Spanish text from the display model. OOPS 2013-05-23 10:08:38 -04:00
brianjlowe
188761c52e work on VIVO-60 application ontology controls for property/class combinations 2013-05-22 16:48:52 -04:00
j2blake
1214292e6d VIVO-84 Add Spanish text to the display model.
What will happen to this text when the user edits the pages?
2013-05-09 12:34:48 -04:00
j2blake
bf973dcc49 VIVO-75 A first pass at Spanish labels for VIVO-core ontology 2013-05-06 14:41:30 -04:00
tworrall
af4f84759c additional home page redesign changes 2013-05-02 12:34:18 -04:00
tworrall
6e8f5038a4 more home page redesign changes 2013-04-30 15:44:02 -04:00
tworrall
f31f527869 not custom list view for researchAreaOf 2013-02-19 12:24:34 -05:00
tworrall
867370adb9 more refactoring for multiple profile view support 2013-02-08 16:18:01 -05:00
j2blake
a3bd67097b VIVO-12 NIHVIVO-4011 Provide config and GUI for selecting Locale 2013-01-24 16:14:45 -05:00
stellamit
117f634829 inactivating 1.5 data migration in trunk 2012-10-19 19:38:38 +00:00
hjkhjk54
67449f6eea added space next to rdfs prefix in menu.n3 2012-08-20 19:25:00 +00:00
stellamit
8fe896b44d merging from 1.5 branch 2012-07-12 20:31:18 +00:00
hjkhjk54
550bf0f0dc updates for display model migration 2012-07-06 00:06:11 +00:00
stellamit
b1d14bcc93 NIHVIVO-3868 remove AwardReceipt from classgroup 2012-07-03 14:28:16 +00:00
stellamit
bc31a42585 NIHVIVO-3863 remove AwardReceipt from class group 2012-07-03 14:27:13 +00:00
briancaruso
e184f2ade3 Moving vivoSearchProhibited.n3 to ontologies/app/loadedAtStartup
Fixing a bug in the ContextNodeFields where initialBindings were no longer getting used so a critical variable in the SPARQL query was free. NIHVIVO-3853
2012-07-03 00:14:25 +00:00