Commit graph

753 commits

Author SHA1 Message Date
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
tworrall
f31f527869 not custom list view for researchAreaOf 2013-02-19 12:24:34 -05:00
tworrall
3b50b82f2e Merge branch 'develop' of https://github.com/vivo-project/VIVO into develop
Changes for multi view support. See commit message.
2013-02-11 16:18:58 -05:00
tworrall
867370adb9 more refactoring for multiple profile view support 2013-02-08 16:18:01 -05:00
j2blake
47875673a2 Clean up web.xml and create a unit test to keep it clean.
VIVO-19
2013-02-04 17:23:22 -05:00
j2blake
a3bd67097b VIVO-12 NIHVIVO-4011 Provide config and GUI for selecting Locale 2013-01-24 16:14:45 -05:00
hudajkhan
4086611ac9 Adding edit request ajax controller to web.xml 2012-11-09 09:38:13 -05:00
stellamit
117f634829 inactivating 1.5 data migration in trunk 2012-10-19 19:38:38 +00:00
j2blake
1d3dc28c32 NIHVIVO-3209 Create two controllers: one will show the status of all living instances of VitroBackgroundThread (for system monitoring); the other will wait until they are idle (for Selenium tests). 2012-10-15 19:23:09 +00:00
j2blake
5293faf80b NIHVIVO-3988 Change the handling of multiple root user accounts, and remove the back-door login mechanism. 2012-10-08 16:46:44 +00:00
tworrall
1b9c1d9925 merging 4296 to the trunk 2012-10-05 17:40:45 +00:00
hjkhjk54
67449f6eea added space next to rdfs prefix in menu.n3 2012-08-20 19:25:00 +00:00
tworrall
d5624a9669 merging r4250 to the trunk 2012-08-06 16:26:04 +00:00