Commit graph

329 commits

Author SHA1 Message Date
mb863
e7328ae668 merge r5446:5449 r5486 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-27 18:40:37 +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
bdc34
2968a09613 merge to trunk. Fixing exceptions on submission of null value in dataproperty form. NIHVIVO-1021 2010-07-27 14:44:16 +00:00
nac26
cc0aab3814 merging from nihvivo-rel-1.1-maint branch: removing "new" from form headings in attempt to minimize user confusion NIHVIVO-1012 2010-07-26 21:12:40 +00:00
mb863
6978b85600 NIHVIVO-1015: Fixed: Cropping photo creating extra gap when reducing browser size 2010-07-26 19:33:23 +00:00
rjy7
6862104e24 Merge r5487 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 19:13:56 +00:00
rjy7
37c2990bba Merge r5484 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-26 18:40:28 +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
ass92
1f4a99f770 Display statement correction. 2010-07-22 22:49:02 +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
bdc34
8413938501 Merge to trunk. Adding cancel button to default object property form. NIHVIVO-951 2010-07-22 20:48:12 +00:00
ass92
fb26b874de Filed download correction for merge individuals tool. 2010-07-22 20:30:09 +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
rjy7
4b990e4649 Merge r5382 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint 2010-07-22 15:44:34 +00:00
bdc34
7911fa6490 Merged to trunk. Changed the way a new individual is created on the siteAdmin NIHVIVO-881 2010-07-22 15:19:15 +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
bdc34
0b97ec523b merging URL validation in defaultLinkForm.jsp 2010-07-21 18:44:34 +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
bjl23
7d41fde0b3 adding some explanatory text to new ingest tools 2010-07-15 18:12:15 +00:00
cdtank
2fc49b4ac8 1. Made wordings change 2010-07-15 17:26:12 +00:00
cdtank
b3dc7364ef 1. Made minor changes to image display logic
2. Made sparkline text changes as requested by Nick C.
2010-07-15 17:02:33 +00:00
cdtank
94d8de065e 1. Made changes so that proper thumbnail image location can be retrieved 2010-07-15 16:42:47 +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
ass92
f72b5e099e code modification 2010-07-15 15:11:26 +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
619d797a25 1. Testing out a way to get image thumbnail url for a profile of a person
2. Fixed a bug: when no moniker is present, in person level vis, moniker related jQuery code threw error.
2010-07-15 05:49:38 +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
ass92
7a13729116 result page for merge tool added 2010-07-14 21:04:38 +00:00
mb863
624b0120bd NIHVIVO-808: Fixed for IE 7 and 8, working on IE 6 2010-07-14 19:49:15 +00:00