ryounes
|
c46809198a
|
Manually restore merge info that got lost in a previous commit
|
2011-07-25 20:16:00 +00:00 |
|
ryounes
|
bd890d4e53
|
Record-only merge of r8795 from maint-rel-vivo-1.3
|
2011-07-25 20:06:50 +00:00 |
|
hjkhjk54
|
e2a82c3809
|
NIHVIVO-3056 Update web.xml to include Page Controller servlet to allow menu page to display without null pointer exception
|
2011-07-25 18:01:00 +00:00 |
|
ryounes
|
af968e3000
|
Record-only merge of r8826-8827 from maint-rel-vivo-1.3
|
2011-07-25 16:05:31 +00:00 |
|
ryounes
|
25ddcac07a
|
Fix comments (mostly alignments)
|
2011-07-25 15:52:51 +00:00 |
|
ryounes
|
b765eeab79
|
Merge r8824 from maint-rel-vivo-1.3
|
2011-07-25 15:10:40 +00:00 |
|
ryounes
|
17c935f666
|
Merge r8822 from maint-rel-vivo-1.3
|
2011-07-25 15:04:14 +00:00 |
|
briancaruso
|
47d8742503
|
checking for null RequestDispatcher in PageRoutingFitler
|
2011-07-25 14:54:03 +00:00 |
|
ryounes
|
b03c4399c6
|
Merge r8819 from maint-rel-vivo-1.3
|
2011-07-25 14:20:52 +00:00 |
|
stellamit
|
3a853c54f8
|
merging NIHVIVO-3028 from branch
|
2011-07-23 03:06:03 +00:00 |
|
briancaruso
|
199a5f6c2f
|
merging 8813 8810 8803 8802 8741 8731
|
2011-07-22 23:20:13 +00:00 |
|
ryounes
|
ee42cad576
|
NIHVIVO-3042 Remove property group rank comparison from GroupedPropertyList.PropertyRanker
|
2011-07-22 21:06:29 +00:00 |
|
stellamit
|
283ab767d9
|
merging from branch
|
2011-07-22 20:51:28 +00:00 |
|
brianjlowe
|
f46e4b46f0
|
NIHVIVO-3036 fixed lockup of system when adding superclass of class with many individuals
|
2011-07-22 19:58:53 +00:00 |
|
hjkhjk54
|
4fa16f31ac
|
Updates for both NIHVIVO-3039 and NIHVIVO-3038
|
2011-07-22 19:53:18 +00:00 |
|
brianjlowe
|
1713933e93
|
NIHVIVO-3029 fixes deletion of class groups and property groups, and fixes excessive locking during VClassGroupCache rebuild
|
2011-07-22 18:05:43 +00:00 |
|
ryounes
|
e4233c003b
|
NIHVIVO-3020 Refactor code that puts properties into groups to loop through properties first, rather than groups, so that properties assigned to non-existent groups get assigned to "other" group rather than being dropped. Also makes more sense this way and avoids unnecessary repetitions. Remove group-level sorting because this is done for the property list as a whole.
|
2011-07-22 16:53:06 +00:00 |
|
deepakkoni
|
adba60a9de
|
NIHVIVO-2979 Committing functionality to the trunk.
|
2011-07-22 16:52:48 +00:00 |
|
manolobevia
|
1006b4316e
|
NIHVIVO-3035: Fixed display issue for generic individual pages
|
2011-07-22 16:44:08 +00:00 |
|
deepakkoni
|
96e65e96c3
|
|
2011-07-22 16:34:20 +00:00 |
|
manolobevia
|
cf26240fc4
|
NIHVIVO-2280: Changed div for sections, removed inline styles, fixed display isuses for IE6 and 7 on add/edit account pages
|
2011-07-21 20:42:03 +00:00 |
|
cappadona
|
47c5b386d8
|
NIHVIVO-3022 NIHVIVO-2980 Merged r8790 from maint-rel-vivo-1.3 branch.
|
2011-07-21 19:55:03 +00:00 |
|
hjkhjk54
|
e1eca52416
|
Updating javascript to enable display of correct content type name in internal class message "only display x within my institution" on content type change. NIHVIVO-3026
|
2011-07-21 19:17:24 +00:00 |
|
hjkhjk54
|
154a3b80ad
|
Including default namespace to be sent back to template NIHVIVO-3022
|
2011-07-21 18:41:02 +00:00 |
|
brianjlowe
|
1cbde6cb99
|
minor fix to label text on edits_edit backend page
|
2011-07-21 18:06:00 +00:00 |
|
ryounes
|
0877635c3f
|
Merge r8779-8780 from maint-rel-vivo-1.3
|
2011-07-21 16:16:32 +00:00 |
|
ryounes
|
b73939fc80
|
NIHVIVO-1512 ReadOnlyBeansWrapper - draft implementation, not yet functioning as desired. Remove a deprecated method.
|
2011-07-21 16:04:23 +00:00 |
|
hjkhjk54
|
6833284706
|
Updating logging for NIHVIVO-3015 and NIHVIVO-2999
|
2011-07-21 15:16:24 +00:00 |
|
cappadona
|
fd945e97ad
|
NIHVIVO-1481 Merged r8774 from maint-rel-vivo-1.3 branch.
|
2011-07-21 12:33:41 +00:00 |
|
cappadona
|
fe4104023f
|
NIHVIVO 2836 Merged r8772 from maint-rel-vivo-1.3 branch.
|
2011-07-21 12:29:08 +00:00 |
|
manolobevia
|
a2bff22fb2
|
NIHVIVO-2853: Now user dropdown menu link displays in IE6
|
2011-07-20 21:20:11 +00:00 |
|
j2blake
|
0d1e79148e
|
Merge r8765 from release 1.3 branch
|
2011-07-20 20:30:11 +00:00 |
|
manolobevia
|
30fa390d07
|
Fixed display issues in IE6 in VITRO theme header
|
2011-07-20 20:16:12 +00:00 |
|
manolobevia
|
78667bd13e
|
NIHVIVO-2993: Fixed display issues in menu management main page for IE6 and IE7
|
2011-07-20 19:33:35 +00:00 |
|
ryounes
|
e664b8bf62
|
NIHVIVO-2974 Allow for vivo-specific extensions to SiteAdminController. Move vivo-specific links to this extension.
|
2011-07-20 19:31:18 +00:00 |
|
ryounes
|
d3fb0d8f50
|
Merge r8739, r8744 from maint-rel-vivo-1.3 branch
|
2011-07-20 19:25:54 +00:00 |
|
tworrall
|
ae61e162e6
|
merging branch updates for NIHVIVO-2992 and NIHVIVO-2995
|
2011-07-20 19:23:14 +00:00 |
|
tworrall
|
885e8f83de
|
merging branch updates for NIHVIVO-2992 and NIHVIVO-2995
|
2011-07-20 19:21:48 +00:00 |
|
tworrall
|
c1d5f4aac3
|
merging branch updates for NIHVIVO-2992 and NIHVIVO-2995
|
2011-07-20 19:19:58 +00:00 |
|
manolobevia
|
10d59d339e
|
NIHVIVO-2992: Putting the fix for IE6 and IE 7 of account profile association in vitroIE6.css and vitroIE7.css
|
2011-07-20 18:46:34 +00:00 |
|
hjkhjk54
|
5170a1476b
|
Updating individuals for classes data getter to sort class list for display
|
2011-07-20 18:40:59 +00:00 |
|
manolobevia
|
a817d4c6bb
|
NIHVIVO-2890: Made css files (ie6.css and ie7.css) for resolving browser layout issues theme agnostic.
|
2011-07-20 17:41:49 +00:00 |
|
manolobevia
|
09af6ecd5e
|
NIHVIVO-2986: Deleted input checkbox for deletion on ROOT
|
2011-07-20 17:28:51 +00:00 |
|
cappadona
|
4ac8ecdeb2
|
Merged r8748 from maint-rel-vivo-1.3 branch.
|
2011-07-20 16:14:41 +00:00 |
|
j2blake
|
5de98569bf
|
Merge r8729, r8746 from the release 1.3 maintenance branch
|
2011-07-20 16:06:19 +00:00 |
|
briancaruso
|
5ff4bc5d6d
|
Merging from 1.3 maint branch.
|
2011-07-20 15:42:26 +00:00 |
|
cappadona
|
6ecc1cc704
|
Merged r8736 from maint-rel-vivo-1.3 branch.
|
2011-07-20 15:03:24 +00:00 |
|
manolobevia
|
993989383b
|
NIHVIVO-2840: Moved individual css related to vivo properties to vivo
|
2011-07-20 14:46:25 +00:00 |
|
ejc12
|
45349f6128
|
NIH-2981
Merging branches/maint-rel-vivo-1.3/utilities/ingest deletion Rev 8732
Removing Joe's ingest files.
|
2011-07-20 12:51:35 +00:00 |
|
ryounes
|
54b8d9ab2c
|
Merge r8732 from maint-rel-vivo-1.3
|
2011-07-19 23:07:18 +00:00 |
|