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

4381 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen V. Williams
3f723dcb27 Merge branch 'develop' of github.com:vivo-project/VIVO into develop 2013-08-21 20:53:14 -06: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
e97d2259e8 VIVO-248 Describe RDF changes in upgrade document 2013-08-21 17:16:28 -04:00
brianjlowe
3230186415 in-process update of TBox filegraphs for latest ISF 2013-08-21 16:25:17 -04:00
j2blake
d084e9620d Accidentally committed catalog-v001.xml 2013-08-21 16:16:48 -04:00
j2blake
5f7bbc6799 VIVO-248 Use /rdf instead of /rdffiles 2013-08-21 15:55:07 -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
brianjlowe
1d5864809c update to add publication generator to deal with generic Relationship properties 2013-08-19 15:24:55 -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
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
a728d53c22 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-08-12 11:22:34 -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
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
tworrall
6950aab59c fixed a typo 2013-08-07 15:02:42 -04:00
brianjlowe
a8f1bfcf15 working on converting position editing to ISF 2013-08-07 13:47:17 -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
cd3ae0d0ad publication form updates for ISF 2013-08-06 10:35:13 -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
j2blake
9fda9d2922 VIVO-235 Improve build instructions. 
Tell the user what to expect when they run "ant all", and how to distinguish success from failure.
 2013-08-01 17:18:17 -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
tworrall
a2ce7abf73 VIVO-216 made the controllers threadsafe (thanks for the example, Jim) 2013-07-22 13:25:34 -04:00
j2blake
ea2ab8cd3b VIVO-137 Move the i18nChecker utility to utilities/languageSupport 2013-07-19 16:28:03 -04:00
j2blake
2155394810 VIVO-137 improve i18nChecker 
Recognize sets of language-dependent template files. Only report warnings if they use i18n()
Reduce the number of false positives
Speed things up.
 2013-07-19 16:26:33 -04:00
j2blake
b6401de8aa VIVO-216 Remove instance variables to make the servlet thread-safe. 2013-07-18 16:16:05 -04:00
j2blake
d667f63632 VIVO-212 Rename WADF access methods on VitroRequest 
Use the term Unfiltered instead of Full, for consistency with other places in Vitro.
 2013-07-18 13:29:24 -04:00
tworrall
b1fc49bc05 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-07-17 15:51:12 -04:00
tworrall
9d5636d01c moving some i18n() strings from vivo (wilma theme) to vitro 2013-07-17 15:50:37 -04:00
j2blake
113f7ba94b Remove reference to N3EditFormController, which was removed in 0e26d45a31 2013-07-17 15:47:58 -04:00
j2blake
e9c25cd207 Remove extraneous closing brace 2013-07-17 13:23:28 -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
b155bd7aa3 Merge branch 'develop' of github.com:vivo-project/VIVO into develop 2013-07-16 14:41:06 -04:00
Brian Caruso
b7c80189f0 Adding SearchService to web.xml VIVO-98 2013-07-16 14:40:12 -04:00
tworrall
002cdb7a51 Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop 2013-07-16 10:04:59 -04:00