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

715 commits

Author SHA1 Message Date
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
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
041c091268 VIVO-82 Merge the filters that set up VitroRequest models 
VitroRequestPrep and WebappDaoFactorySDBPrep merge to RequestModelsPrep. WebappDaoFactorySparqlPrep goes away.
 2013-06-06 17:29:07 -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
463203a862 VIVO-82 Split WebappDaoSetup into ContentModelSetup and ModelMaker setup. 2013-05-16 16:43:13 -04:00
j2blake
bd9efdaf2f VIVO-87 First attempt at a caching filter. 2013-05-14 16:38:34 -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
c7ac1750a8 NIHVIVO-3993 Get rid of NavigationController 
Written for release 1.1, but never was used.
 2013-05-07 16:11:17 -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
j2blake
196c857c2f VIVO-25 Fix cross-container errors in web.xml 2013-03-11 14:42:49 -04:00