Commit graph

2162 commits

Author SHA1 Message Date
rjy7
76017acd98 Merge r1180 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-26 19:12:45 +00:00
rjy7
a5ea84b4fe Merge r1177 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-26 18:47:44 +00:00
rjy7
de1bc95731 Merge r1175 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-26 18:39:11 +00:00
ejc12
c13038590c Changing the introductory text to just point to the support section and updating what's available at that location. 2010-07-26 01:13:57 +00:00
bdc34
a89c1550d0 Merge To trunk. Adding filtering of Positions in past. NIHVIVO-984 2010-07-24 21:37:23 +00:00
rjy7
7f27c12fce Merge r1133 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-24 20:24:16 +00:00
cdtank
94b6c47294 1. Made style changes to person level vis front end.
2. Updated co-author vis from Asik.
3. Made code changes so that graphml sent to the flash vis will always be ordered by node ids instead of letting flash vis handle it.
2010-07-23 21:13:13 +00:00
rjy7
bfe2991398 Merge r1122 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 21:00:46 +00:00
rjy7
2db6b67186 Merge r1120 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 20:48:30 +00:00
rjy7
c476bba4e1 Merge r1116 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 20:26:55 +00:00
rjy7
0b023f6f42 Merge r1114 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 19:58:43 +00:00
rjy7
c5031fc9a7 Merge r1110:1112 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 18:43:02 +00:00
rjy7
54da0ca235 Merge r1109 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 18:09:25 +00:00
rjy7
19b9076902 Merge r1106 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 17:41:25 +00:00
rjy7
417363603d NIHVIVO-908 Create additional param in presenter role form so button text can differ from form field labels ("presenter" vs. "presentation") 2010-07-23 17:25:35 +00:00
cdtank
591bb02f4d 1. left a debug statement in javascript causing it to break on browsers that did not have firebug installed. 2010-07-23 15:15:06 +00:00
rjy7
1cffb2bf6f Merge r1091 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-23 13:39:51 +00:00
cdtank
d9793ffb9f 2010-07-22 22:09:32 +00:00
cdtank
53987ce8f3 1. Updated flash vis form Asik.
2. Modified the fix for GUESS compatibility with coauthorship graphml file
2010-07-22 21:38:45 +00:00
bjl23
fbd35a3073 merging some rdf and sparql changes back to the trunk 2010-07-22 21:29:32 +00:00
nac26
77a4342487 merge from rel-1.1-maint branch: Add customForm.css NIHVIVO-952 2010-07-22 21:11:58 +00:00
cdtank
70e58dd4ce 2010-07-22 21:05:40 +00:00
rjy7
9fddfa3d68 Merge r1062 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 19:49:46 +00:00
rjy7
d3f9e12283 merge r1060 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 19:45:39 +00:00
bdc34
29f0b5afb9 Merged to Trunk. URI of property changed in ontology broke short view. NIHVIVO-950 2010-07-22 19:41:52 +00:00
rjy7
302575251f Merge r1045 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 18:50:49 +00:00
rjy7
9eebeba4f9 merge -r 905:908 -r 922 -c 946 -r 984:986 -r 1014:1029 from 1048 http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 18:44:32 +00:00
nac26
b96d1008b0 merge from rel-1.1-maint branch: moving the individual rendering changes back to the vitro 2010-07-22 18:36:24 +00:00
bdc34
ad3bb62b75 Merge to Trunk. Fixing last name label NIHVIVO-947 2010-07-22 18:17:41 +00:00
nac26
39293eeb65 merge from rel-1.1-maint branch: Changed the test on objRows so that properties marked with an update level of "nobody" are still rendered NIHVIVO-848 2010-07-22 18:06:22 +00:00
bdc34
ef9eb11ac4 Merge to trunk. Fixing jsp compile error in tomcat 6.0.10 NIHVIVO-937 2010-07-22 17:49:44 +00:00
rjy7
2d59346f54 Merge r1035 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 17:28:54 +00:00
rjy7
7820d06255 Merge r1030 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 16:44:58 +00:00
nac26
9e6382e269 merge from rel-1.1-maint branch: changed label for type select list to "presentation type". good catch by Brian Lowe NIHVIVO-908 2010-07-22 16:02:47 +00:00
nac26
7dedb2720e merge from rel-1.1-maint branch: verbose property display is back, empty groups are almost there NIHVIVO-845, NIHVIVO-848 2010-07-22 16:00:32 +00:00
rjy7
112c2946cb Merge r1025 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 15:57:42 +00:00
rjy7
cb15494b95 Merge r1010 r1018:1023 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-22 15:43:18 +00:00
bdc34
eaf0a0e2d3 Merge to trunk. Changed the way a new individual is created on the siteAdmin NIHVIVO-881 2010-07-22 15:18:25 +00:00
jeb228
13decf7266 NIHVIVO-918 Merge 1011 from branch 2010-07-22 14:09:49 +00:00
bdc34
f8a9ffe9c5 Merge to trunk. changing forms for addRoleToPersonTwoStage.jsp so that it can edit a role with out a core:roleIn statement. NIHVIVO-863 2010-07-22 00:42:44 +00:00
bdc34
59db70e8e0 Merging to Trunk. Changing addPublicationToPerson.jsp to skip form when trying to edit an existing authorship, NIHVIVO-912 2010-07-22 00:35:24 +00:00
bdc34
012be3fdab Merge to trunk: Adding custom form that redirects to publication instead of editing. NIHVIVO-912 2010-07-21 22:16:46 +00:00
cdtank
50dd3ba19f 1. Fixed the issue when the author's name was really really long, flash vis used to create a scrollbar just for the legend. We made use of ellipsis in case of really long names.
2. The same for the sidebar author names.
3. Removed unused code.
2010-07-21 21:04:55 +00:00
bdc34
f789ab91e7 Merging change from branch:
changes to roleShortView.jsp for NIHVIVO-863
  adding error message that only shows up when logged in
  displaying unknown when some part of role is missing
2010-07-21 19:48:07 +00:00
cdtank
7a07c45271 1. code cleanup
2. changed captilization of "Co-authors"
2010-07-21 17:58:19 +00:00
cdtank
7440b856f1 1. Made changes to wordings per Katy's request.
2. Fixed the separator issue for list of coauthors csv file.
3. Made style fix for person level vis.
2010-07-21 16:17:23 +00:00
bdc34
821da68e85 Merging from branch, changing role short view to not display role names if there are none. NIHVIVO-836 2010-07-21 15:28:51 +00:00
rjy7
4482d2556d Merge r970 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-21 14:27:51 +00:00
rjy7
cb14df3cf7 Merge r967 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint 2010-07-21 14:20:03 +00:00
bdc34
73eb40ce80 Merging from rel-1.1-maint, fixing organizationHasPostionHistory.jsp to keep track of person NIHVIVO-889 2010-07-21 14:19:04 +00:00