brianjlowe a270043063 Merge remote-tracking branch 'origin/develop' into dev-isf ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java		2013-08-06 11:05:54 -04:00
..
config	VIVO-18 Rename Log4J properties file	2013-06-21 15:39:15 -04:00
lib	Changes to the SolrSetup class require access to the newer HttpClient libraries	2013-07-24 11:49:56 -04:00
src	Merge remote-tracking branch 'origin/develop' into dev-isf	2013-08-06 11:05:54 -04:00
test	Removing PageDataGetters and its related servlets and tests. VIVO-218	2013-08-05 12:41:15 -04:00
themes/vitro	some i18n cleanup	2013-05-21 10:55:24 -04:00
web	VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before	2013-08-05 15:12:24 -04:00
build.xml	VIVO-234 Ignore a runtime.properties file in the distribution directory	2013-08-01 15:08:15 -04:00
context.xml	VIVO-2 Modify the build so installers can create a container-neutral VIVO.	2013-01-16 14:54:33 -05: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