Commit graph

722 commits

Author SHA1 Message Date
rjy7
b9ac586c20 NIHVIVO-564 Work on dump directive 2010-07-27 22:00:13 +00:00
rjy7
83938a2c19 NIHVIVO-564 Work on dump directive 2010-07-27 21:49:40 +00:00
bdc34
f4409580b4 Cleanup of webapp context root. Removing many unused jsp files and some unused controllers. NIHVIVO-1000 2010-07-27 15:31:19 +00:00
rjy7
ef3988022f NIHVIVO-825 Allow adding a list of scripts or stylesheets with a single call to add() or addFromTheme() 2010-07-27 15:16:07 +00:00
nac26
89f3bbfbd8 merge from nihvivo-rel-1.1-maint branch: removed unnecessary <br> 2010-07-24 21:52:47 +00:00
bdc34
ef3222d0d1 Merge to trunk. Removing debug statement. 2010-07-23 20:47:15 +00:00
bdc34
59801b8dcb Merge to trunk. Fixing error when deleting properties on front end NIHVIVO-953 2010-07-23 20:45:37 +00:00
mb863
0f7d3cbaca Merged manually some changes 2010-07-23 15:52:13 +00:00
nac26
4cd59ee32d merge from nihvivo-rel-1.1-maint branch: collation by subclass functional when property groups are enabled. Valid markup in either case NIHVIVO-846 2010-07-22 21:25:12 +00:00
rjy7
a82411b2f0 merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-22 18:47:44 +00:00
nac26
fa77c80a91 merge from nihvivo-rel-1.1-maint branch: moving the individual rendering changes back to the vitro 2010-07-22 18:38:29 +00:00
jeb228
50cc897669 NIHVIVO-918 Merge 5377 from branch 2010-07-22 14:10:30 +00:00
rjy7
e3d09333c4 Merge r5371:5373 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-21 22:02:11 +00:00
rjy7
4bfeadf3ad Merging r5332 r5336:5338 r5341 r5349 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-20 23:24:01 +00:00
jeb228
68ece6f23b NIHVIVO-906 Merge 5340 Use the <c:url> tag to make the JavaScript location relative to the webapp context. 2010-07-20 19:23:03 +00:00
cdtank
a688d30ac5 1. Attempting to move vivio-specific vis code to "vivo package" 2010-07-20 17:48:30 +00:00
rjy7
a5f60a9f7f Merging r5308, r5320, r5322 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-19 21:37:59 +00:00
cdtank
74edbcd45c 1. Made wording changes & also extension of graphml file to .xml 2010-07-19 19:35:17 +00:00
cdtank
382fd6ae80 1. Made changes to incorporate conditional wordings for side-bar in person level vis. 2010-07-19 19:14:36 +00:00
bdc34
bf7240b440 Fixing how shor views are found on entityMergedPropsList.jsp NIHVIVO-833 2010-07-16 16:35:59 +00:00
cdtank
0d39c89da6 1. Code cleanup 2010-07-16 16:05:59 +00:00
nac26
21bd882d1b stylesheet inclusion for visualization NIHVIVO-782 2010-07-16 12:45:13 +00:00
nac26
8c4238b05f login improvements included label change (email or password) and cancel link on password change NIHVIVO-227 2010-07-16 12:44:10 +00:00
nac26
07d018591b some UI tweaks and style for visualization NIHVIVO-782 2010-07-16 12:40:08 +00:00
cdtank
f444dbb65e 1. Added style for thumbnail images 2010-07-15 21:11:23 +00:00
cdtank
0143c1db34 2010-07-15 21:03:07 +00:00
cdtank
5203cd0182 1. Made changes to the sparkline text per Nick/Micah's request
2. Made chanegs to content on person level page
2010-07-15 19:35:36 +00:00
cdtank
2fc49b4ac8 1. Made wordings change 2010-07-15 17:26:12 +00:00
nac26
f275ba4444 moved placement and style of cancel link for consistency NIHVIVO-768 2010-07-15 16:37:56 +00:00
nac26
b99b6fac14 fixed a couple typos in the comments at the bottom of this page 2010-07-15 16:29:49 +00:00
jeb228
fad9cb6ddb NIHVIVO-768 provide a "cancel" link from the forced password change. 2010-07-15 14:54:36 +00:00
nac26
f4da2cc28d updated label to Email or Username NIHVIVO-227 2010-07-15 13:02:36 +00:00
cdtank
1b93c6f85a 1. Temporarily disabled the loading image un till we rework the vis display pipeline. 2010-07-14 21:23:22 +00:00
cdtank
6a5194d677 1. Made changes so that for people who have 0 known publications sparkline vis is not generated at all for their profile page. 2010-07-14 19:30:06 +00:00
jeb228
46aed7047c NIHVIVO-772 entityBasic.jsp will use imageUploadUtils.js instead of confirmPhotoDeletion.js. Modify PropertyEditLinks.java so only the thumbnail delete link will have the "thumbnail" class. 2010-07-14 13:45:35 +00:00
bdc34
418fc432e0 Changing entityMergedPropList so that it will look for customShortViews on all directly asserted classes before checking any super classes. NIHVIVO-629 NIHVIVO-630 2010-07-14 00:09:47 +00:00
mb863
8ad5417253 NIHVIVO-772: I am using the class 'thumbnail' to delete the thumbnail instead of class delete. 2010-07-13 20:19:38 +00:00
jeb228
a53572a354 Add license lines to some visualization files. 2010-07-13 18:06:35 +00:00
cdtank
f091238731 1. Added code to color the author names in sidebar (in person level vis) depending whether they are ego or not 2010-07-13 17:01:10 +00:00
mb863
f0900aa262 NIHVIVO-364: Improved the error message if the Contact Form email address is not provided under Site Information 2010-07-13 16:07:32 +00:00
mb863
529decb0fe NIHVIVO-364 2010-07-13 16:06:16 +00:00
ass92
f4d219637a NIHVIVO-330 new jsp result page for tool to merge individuals 2010-07-13 15:35:02 +00:00
mb863
ecd92ad5d6 NIHVIVO-577. Improved photo upload: error messages, photo thumbnail placeholder, and cleaned javascript files 2010-07-13 14:37:27 +00:00
nac26
bb08bef23f Add focus on email or new password fields. Also updated validation message for password length when creating a new password NIHVIVO-227 2010-07-13 14:03:24 +00:00
cdtank
1ff00fa92f 1. Code cleanup
2. Made changes so that images in IE show up properly & scale properly.
2010-07-12 20:27:02 +00:00
bdc34
ffc9fc47e9 Adding feedback from search IndexController instead of a blank screen, so user knows when indexing is finished. NIHVIVO-783
Working on shor views for grants. NIHVIVO-630.
2010-07-12 18:51:19 +00:00
nac26
8d5e7a2dc0 JS tweaks for form validation (file upload) and delete confirmation NIHVIVO-577 2010-07-12 15:59:37 +00:00
bdc34
81e40b0fef Adding license to IU files 2010-07-09 23:05:53 +00:00
rjy7
cb1ab5a041 In FreeMarkerHttpServlet.getTemplateLoader(), handle the case where the theme directory has no templates subdirectory without an error. 2010-07-09 22:10:43 +00:00
bdc34
0d09bcf546 merging in http://svn.mannlib.cornell.edu/svn/vitro/branches/iu-vis-vitro-1.1-pre-release from r4966 to r5166 2010-07-09 22:04:26 +00:00