litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3686 commits 8 branches 1 tag 111 MiB
Commit graph

681 commits

Author SHA1 Message Date
brianjlowe
a60c4ff048 Grant and AdvisingRelationship migration 2013-09-13 11:32:55 -04:00
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
hudajkhan
a9ebf8f94b updates for concept search and label management 2013-09-05 15:45:49 -04:00
brianjlowe
5d2e44c08f property link suppression annotations 2013-09-04 10:01:11 -04:00
brianjlowe
722307358f subclasses of skos:Concept 2013-09-03 09:01:22 -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
brianjlowe
978c9ccd5f added domain and range to bearer_of and removed has_role and has_function 2013-08-28 10:08:54 -04:00
j2blake
1994ab03a1 VIVO-274 move permission_config.n3 to rdf/auth/everytime 
Get rid of the PermissionSetsLoader, keep the smoke tests.
 2013-08-27 17:26:35 -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
brianjlowe
74cd0e062d updated realizedBy/realizes properties 2013-08-27 11:13:52 -04:00
brianjlowe
f0ba88badc Merge branch 'dev-isf' of https://github.com/vivo-project/VIVO into dev-isf 2013-08-27 10:34:08 -04:00
brianjlowe
de05954218 ongoing work on ISF support 2013-08-27 10:33:22 -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
0312ebd448 ISF filegraph improvements 2013-08-23 11:02:39 -04:00
hudajkhan
706e0ae1c1 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 
Conflicts:
	.gitignore
 2013-08-22 15:54:37 -04:00
hudajkhan
0511404a47 updates to remove errant file and updates for adding concept 2013-08-22 15:48:56 -04:00
brianjlowe
3230186415 in-process update of TBox filegraphs for latest ISF 2013-08-21 16:25:17 -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
brianjlowe
0e92596459 removing unneeded bfo file from file graphs 2013-08-20 15:45:01 -04:00
j2blake
ca951c6bf3 VIVO-248 Move filegraph RDF files into the home directory 2013-08-20 15:26:09 -04:00
tworrall
55a4d1dc35 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-19 14:52:19 -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
j2blake
1c9f9f5f1a VIVO-246 Re-implement the FreemarkerConfiguration 
The Configuration must contain mutable information like the theme directory and the TemplateLoader. It must also be request-specific so it can have the correct Locale for language support. But we should only have one instance, so there is only one TemplateCache (alternatively, one TemplateCache per theme).

Previously, this was addressed by intercepting the Template processing and adding the request-based info to the Environment. However, this interception code needed to appear each time a Template was processed. This was sometimes overlooked, and at best introduced a bunch of duplicated code.

Instead, I extended the freemarker Configuration class to include a ThreadLocal that holds request-specific information.
 2013-08-08 13:23:40 -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
brianjlowe
087e33f137 person subtypes for 1.6 2013-07-24 16:38:45 -04:00
brianjlowe
1fafc58def ISF owl files 2013-07-24 15:03:13 -04:00
tworrall
f2ce218a87 VIVO-105: English and Spanish versions of the about page 2013-07-22 16:19:40 -04:00
j2blake
113f7ba94b Remove reference to N3EditFormController, which was removed in 0e26d45a31 2013-07-17 15:47:58 -04:00
j2blake
1d16f165dc VIVO-213 smoke test to check JVM temp directory 
If it isn't set, if it isn't a directory, if we can't access it, if we can't create a temp file, complain.
 2013-07-17 13:01:33 -04:00
Brian Caruso
b7c80189f0 Adding SearchService to web.xml VIVO-98 2013-07-16 14:40:12 -04:00
tworrall
c3bdcb6676 minor change, renamed a variable 2013-06-28 10:15:32 -04:00