vitro/webapp/web
bdc34 c3cb7b05a2 Fixing page index on lucene based tabs. NIHVIVO-1143
Conflicts:

	webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java
	webapp/web/templates/entity/entityListForTabs.jsp
2010-10-06 20:54:29 +00:00
..
admin Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files. 2010-10-05 03:13:14 +00:00
css NIHVIVO-564 Style modifications for dump output 2010-08-09 18:59:24 +00:00
edit Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files. 2010-10-05 03:13:14 +00:00
fileupload Removing debugging messages/text 2010-05-17 14:01:01 +00:00
images NIHVIVO-577. Improved photo upload: error messages, photo thumbnail placeholder, and cleaned javascript files 2010-07-13 14:37:27 +00:00
jenaIngest NIHVIVO 1196 : Text change for radio buttons. 2010-10-06 17:41:06 +00:00
js 2010-10-06 20:41:52 +00:00
jsp Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000 2010-07-27 15:31:19 +00:00
siteAdmin NIHVIVO-736 begin the transition from LoginFormBean to LoginStatusBean. 2010-10-06 16:06:25 +00:00
src 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
templates Fixing page index on lucene based tabs. NIHVIVO-1143 2010-10-06 20:54:29 +00:00
themes NIHVIVO-918 Merge 5377 from branch 2010-07-22 14:10:30 +00:00
xslt 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
about.jsp Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000 2010-07-27 15:31:19 +00:00
commentsForm.jsp Rewrote comment form controllers and templates in FreeMarker. 2010-05-19 19:50:54 +00:00
contact_err.jsp NIHVIVO-358 merging bug fixes into trunk 2010-04-13 16:49:33 +00:00
dojo.js 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
error.jsp Merge r6025 from nihvivo-rel-1.1-maint branch. Moved footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme. Updated include paths for all templates that include these 3 files. 2010-10-05 03:13:14 +00:00
robots.txt 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
usageTerms.jsp 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