bdc34 60c71ee2ae Merge to trunk. Removing more portal filtering when there is only one portal. NIHVIVO-998		2010-07-24 21:57:54 +00:00
..
config	Merge to trunk. Adding filtering to EntityMergedPropertyListcontroller NIHVIVO-984	2010-07-24 21:36:12 +00:00
lib	NIHVIVO-817 Use Java Advanced Imaging library to crop and scale images instead of javax.imageio	2010-07-15 20:05:41 +00:00
ontologies/system	NIHVIVO-157 manual merge of the changes from branch NIHVIVO-157-file-storage	2010-06-20 19:23:19 +00:00
src	Merge to trunk. Removing more portal filtering when there is only one portal. NIHVIVO-998	2010-07-24 21:57:54 +00:00
test	Merge to trunk. Fixing tab flag 1 filtering when there is only one portal. NIHVIVO-987	2010-07-23 21:04:08 +00:00
web	merge from nihvivo-rel-1.1-maint branch: removed unnecessary <br>	2010-07-24 21:52:47 +00:00
build.xml	NIHVIVO-649 Add freemarker template flattening to build. Includes flattening of template directory structure in vivo theme, and renaming of templates as needed for clarity.	2010-07-08 17:10:31 +00:00
context.xml	Tell Tomcat not to attempt to persist the Vivo user sessions when Tomcat shuts down.	2010-06-03 21:12:22 +00:00
product-build.xml	NIHVIVO-213 Modify product-build so a /src directory does not require a productMods/WEB-INF/lib directory.	2010-04-29 20:24:25 +00:00
webapp.doxyfile	Improve output: distinguish between failed assertions (failures) and unexpected exceptions (errors), and print a filtered stack trace for any exception.	2010-01-29 22:13:57 +00:00