Commit graph

3714 commits

Author SHA1 Message Date
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
cappadona
c9b589c52b NIHVIVO-352 Style tweak to make search snippet text smaller. 2011-07-19 13:45:09 +00:00
cappadona
c33139d50a Applied some changes that were overlooked at the Vitro level for menu management and institutional internal class (not sure if this should even be in Vitro, if so perhaps a name change is in order). 2011-07-19 12:59:43 +00:00
deepakkoni
6ba5a566e4 NIHVIVO-2970 - removing the changes added to context node queries since that is reducing the recall in search results. 2011-07-18 22:32:21 +00:00
ryounes
f1795ab50a Fix indenting 2011-07-18 21:48:37 +00:00
deepakkoni
14e1ef9d79 Filtering out the individual's labels from context node queries. 2011-07-18 21:46:18 +00:00
hjkhjk54
504037488f changed some log.info statements back to debug 2011-07-18 21:15:51 +00:00
deepakkoni
1d5f5e4edb NIHVIVO-2970 - 1) 1. Local names of context nodes appearing in snippet (result 1) -- should be resolved with this fix. 2011-07-18 21:09:56 +00:00
j2blake
7ffba81972 Clarify the explanation and example for vitro.local.solr.url property. 2011-07-18 20:34:57 +00:00
hjkhjk54
24bba51a47 Ensuring name of class shows correctly on internal class page 2011-07-18 20:27:28 +00:00
hjkhjk54
1d9e1fb2ae Updating class counts for internal class menu pages (so counts retrieved based on what you see on page). Also reverted some log info statements in json servlet back to debug level. 2011-07-18 20:16:28 +00:00
j2blake
d8e0734581 Remove the duplicate and obsolete description of vitro.local.solr.url 2011-07-18 19:50:20 +00:00
tworrall
2cf8beb96a removed inline style and changed two divs to sections 2011-07-18 19:32:45 +00:00
ryounes
7d963f83e9 NIHVIVO-2968 Fix servlet mappings in vitro web.xml 2011-07-18 19:26:33 +00:00
ryounes
1674c103a8 Minor tweak to getSnippets() method of PagedSearchController 2011-07-18 19:21:57 +00:00
cappadona
e1c19ba56e NIHVIVO-2963 Completed refactor of menupage.ftl to account for class intersection pages (i.e. only display internal individuals via intersection with institutional internal class). Removed unnecessary files. 2011-07-18 19:11:46 +00:00
brianjlowe
ffad7bf702 NIHVIVO-2958 fixed bug in retrieving class example annotations 2011-07-18 19:09:53 +00:00
j2blake
cf13f22f36 Remove an unused filter, and several unused or empty unit test classes, with data files. 2011-07-18 18:57:55 +00:00
brianjlowe
fbf484b537 NIHVIVO-2964 unfiltered dao method on VitroRequest 2011-07-18 17:48:14 +00:00
hjkhjk54
2fb3cc200f Additional info/debugging statements 2011-07-18 17:37:42 +00:00
manolobevia
608ba09743 NIHVIVO-2858: Fixed extra spacing between email and phone. I can't see extra spacing between email addresses and web pages on person page. Must be fixed in another commit. 2011-07-18 17:20:28 +00:00