Jim Blake e61b82ae85 Merge branch 'maint-rel-1.7' into develop ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/adapters/SpecialBulkUpdatingGraph.java		2014-06-23 14:42:45 -04:00
..
config	Fix licensing issues.	2014-06-14 11:32:48 -04:00
languages/es_GO	there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name	2014-06-20 13:08:55 -04:00
lib	VIVO-773 remove references to IRI-0.8 library.	2014-06-12 16:16:41 -04:00
rdf	VIVO-742 Many changes to remove "solr" from the code base.	2014-04-23 14:20:14 -04:00
src	Merge branch 'maint-rel-1.7' into develop	2014-06-23 14:42:45 -04:00
test	VIVO-799 Add setRdfsLabel() to unit test class.	2014-06-18 17:41:38 -04:00
themes/vitro	there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name	2014-06-20 13:08:55 -04:00
web	VIVO-805: fix i18n parameter issue on password length string	2014-06-23 10:56:19 -04:00
build.xml	VIVO-801 Move RDB migrator from VIVO to Vitro	2014-06-18 17:33:57 -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