Jim Blake 2cd3f36db0 VIVO-769 Merge branch 'feature/orcid' into develop ... Conflicts: webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PrimitiveRdfEdit.java webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java		2014-05-07 17:31:44 -04:00
..
config	Add SearchEngine logging to the Developer Panel	2014-05-05 16:53:36 -04:00
languages/es_GO	Merge branch 'maint-rel-1.6' of git+ssh://github.com/vivo-project/Vitro into maint-rel-1.6	2013-12-09 17:00:36 -05:00
lib	Upgrade HttpClient libraries from 3.1 to 4.3.2	2014-05-07 17:07:39 -04:00
rdf	VIVO-742 Many changes to remove "solr" from the code base.	2014-04-23 14:20:14 -04:00
src	VIVO-769 Merge branch 'feature/orcid' into develop	2014-05-07 17:31:44 -04:00
test	Merge branch 'develop' into feature/requestedActions	2014-04-28 12:02:43 -04:00
themes/vitro	VIVO-541 First cut at the developer panel.	2013-11-17 11:52:18 -05:00
web	Add SearchEngine logging to the Developer Panel	2014-05-05 16:53:36 -04:00
build.xml	Refine the installation process for Solr 4.7.2	2014-05-01 14:25:12 -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