Jim Blake 2fa9583569 Merge branch 'develop' into feature/fauxEditing ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationBeanLoader.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/configuration/ConfigurationRdfParser.java webapp/src/edu/cornell/mannlib/vitro/webapp/utils/jena/Critical.java		2014-11-09 16:14:48 -05:00
..
config	Fix licensing issues.	2014-06-14 11:32:48 -04:00
languages/es_GO	updated class to use i18n strings defined in all.properties rather than hard-coded strings in the class	2014-08-19 14:47:10 -04:00
lib	Update JUnit and add Hamcrest matchers.	2014-10-24 10:27:53 -04:00
rdf	enabling model change preprocessors to be associated with application and not just edit configuration objects	2014-07-30 14:31:49 -04:00
src	Merge branch 'develop' into feature/fauxEditing	2014-11-09 16:14:48 -05:00
test	Merge branch 'develop' into feature/fauxEditing	2014-11-09 16:14:48 -05:00
themes/vitro	VIVO-201: removed some css redundancies	2014-09-22 12:58:52 -04:00
web	Add link to verbose panel, handle VCard oddities.	2014-11-07 10:32:33 -05:00
build.xml	Copy build.properties correctly into WEB-INF/resources.	2014-07-08 12:19:13 -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