sjm222
|
9fac8948e2
|
adding in changes made to 1.1.1 branch
|
2010-10-05 14:32:58 +00:00 |
|
nac26
|
3734b16d1c
|
updated include path for footer.jsp, identity.jsp and menu.jsp to reflect their new location in the vitro core
|
2010-10-05 03:14:58 +00:00 |
|
nac26
|
5bb4b7794f
|
Merge r1445 from rel-1.1-maint branch. Moving footer.jsp, identity.jsp, and menu.jsp to vitro core (were temporarily in vivo/productMods) so they are not tied to vivo-basic and can be used by any theme.
|
2010-10-04 23:39:05 +00:00 |
|
nac26
|
7e49295417
|
Merge r1440 from rel-1.1-maint branch. Moving footer.jsp, identity.jsp, and menu.jsp so they are not tied to vivo-basic and can be used by any theme.
|
2010-10-04 17:20:03 +00:00 |
|
rjy7
|
1bd624d550
|
NIHVIVO-1187 Migrate handling of empty or invalid query from PagedSearchController to FreemarkerPagedSearchController
|
2010-10-01 20:53:14 +00:00 |
|
nac26
|
96c91a9195
|
Merge r1431,1436 from rel-1.1-maint branch (IE6 fix for coathorship visualization page) NIHVIVO-954
|
2010-10-01 20:01:46 +00:00 |
|
nac26
|
eba31a884a
|
Merge r1430 from rel-1.1-maint branch (IE fix for search bar width)
|
2010-10-01 18:42:09 +00:00 |
|
cdtank
|
3ed20ae4fd
|
1. Made checking for "if the sparkline visualization should be rendered for an entity" safer per Brian L's suggestion.
|
2010-10-01 17:42:31 +00:00 |
|
cdtank
|
0f6c18fca1
|
1. Removed the checking of publication being an instance of bibo:Document in sparql query. This check is unnecessary. Refer [VIVOFEED-583] at http://issues.library.cornell.edu/browse/VIVOFEED-583 for more info.
|
2010-10-01 17:25:51 +00:00 |
|
cdtank
|
bc89ddbb91
|
1. Fixed a bug where in person level vis for people who do not have any image attached to it, there was a silent error message being provided to the front-end, which caused for extra css files to be loaded.
|
2010-09-30 20:42:12 +00:00 |
|
rjy7
|
8efaf54ee3
|
Merge r1408:1410 from rel-1.1-maint: externally-linked namespaces.
|
2010-09-29 18:58:51 +00:00 |
|
rjy7
|
b9833f2d11
|
Merge r1397:1399 from rel-1.1-maint
|
2010-09-28 15:34:26 +00:00 |
|
rjy7
|
9a918e911f
|
Merge r1390-1395 from rel-1.1.-maint: custom sorting and collation
|
2010-09-28 15:02:39 +00:00 |
|
rjy7
|
cf56748128
|
Blocking r1386 from merge. The changes were copied to the trunk manually due to numerous conflicts with the branch version.
|
2010-09-23 21:13:34 +00:00 |
|
rjy7
|
3d612872c8
|
NIHVIVO-1098 Make start year optional when adding a new position as well as when editing an existing position
|
2010-09-23 20:26:34 +00:00 |
|
rjy7
|
1b45d59529
|
Fixed bug in interaction with autocomplete help text and other changes on the trunk
|
2010-09-23 20:26:01 +00:00 |
|
rjy7
|
f54cbe5b92
|
NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value.
|
2010-09-21 16:05:38 +00:00 |
|
tlw72
|
84598559fd
|
Merge r1375 from rel-1.1-maint branch (autocomplete help text changes)
|
2010-09-21 14:25:10 +00:00 |
|
tlw72
|
2684dcd035
|
Commented out customForm.acSelector.focus(), which was clearing ac help text
|
2010-09-21 14:04:01 +00:00 |
|
tlw72
|
e76b9647e6
|
r1378 merge from rel-1.1-maint; resized acSelector element
|
2010-09-20 21:11:58 +00:00 |
|
rjy7
|
ce74bfc81e
|
Change sortable event that triggers author reordering from stop to update.
|
2010-09-20 20:11:51 +00:00 |
|
tlw72
|
b01dbf2d54
|
Merge 1375 from rel-1.1-maint branch; autocomplete help text
|
2010-09-20 18:13:00 +00:00 |
|
tlw72
|
e48d80d008
|
Change for autocomplete help text; merge from r1374 in rel-1.1-maint branch
|
2010-09-20 17:46:33 +00:00 |
|
rjy7
|
6af4b3c87d
|
Some refactoring in FreemarkerHttpServlet
|
2010-09-16 15:50:39 +00:00 |
|
cdtank
|
571182b98e
|
1. Made changes to the styling of text for the sparklines. Made them more amenable to IE's whims.
|
2010-09-15 20:46:08 +00:00 |
|
rjy7
|
62761c9542
|
CSS fixes for custom forms
|
2010-09-15 20:20:47 +00:00 |
|
rjy7
|
a83ebecc36
|
NIHVIVO-650 Reworked Freemarker sparkline implementation for better controller/view separation
|
2010-09-10 14:23:58 +00:00 |
|
rjy7
|
5f0e4515fb
|
Merge r1363 from rel-1.1-maint
|
2010-09-10 13:37:41 +00:00 |
|
rjy7
|
f776d5de09
|
NIHVIVO-650 Display label, moniker, and sparkline visualization on Freemarker version of individual profile page
|
2010-09-09 21:56:39 +00:00 |
|
ejc12
|
87bc8d696e
|
Holly did some more tweaking on the AddNonPersonThings test suite.
|
2010-09-08 21:27:27 +00:00 |
|
rjy7
|
24de7c4471
|
Merge r1357 from rel-1.1-maint branch (reverting addition of description field to role custom form and short view)
|
2010-09-08 20:40:02 +00:00 |
|
rjy7
|
5b25d92181
|
Initial work moving individual profile page to Freemarker. Includes temporary servlet mappings for new Freemarker page. Allow adding script tags to the page head element.
|
2010-09-08 20:37:26 +00:00 |
|
ejc12
|
404688f420
|
Holly has finished the AddNonPersonThings test suite except for possible pauses when ran all at once.
|
2010-09-08 20:29:41 +00:00 |
|
ejc12
|
0f96777148
|
Holly is doing some more fine-tuning of the AddNonPersonThings test suite.
|
2010-09-08 18:54:05 +00:00 |
|
ejc12
|
f887bed8ff
|
Holly is continuing to make changes to the AddNonPersonThings suite.
|
2010-09-08 18:37:31 +00:00 |
|
ejc12
|
bbc67bfa0c
|
Holly is adding more tests to AddNonPersonThings.
|
2010-09-08 17:21:03 +00:00 |
|
ejc12
|
39b3738cd9
|
|
2010-09-08 14:37:08 +00:00 |
|
ejc12
|
1a31ec1509
|
|
2010-09-08 14:35:22 +00:00 |
|
rjy7
|
e3c30f3227
|
Merge r1348:1350 from rel-1.1-maint
|
2010-09-08 14:27:28 +00:00 |
|
rjy7
|
b4e5a3903b
|
Merge r1346 from rel-1.1-maint
|
2010-09-08 13:51:47 +00:00 |
|
rjy7
|
d8789cfc67
|
Block merge of r1342, r1344 from rel-1.1-maint. Changes have been applied manually to the trunk.
|
2010-09-08 13:47:56 +00:00 |
|
rjy7
|
5484036ee9
|
Put focus on acSelector field after type is selected in custom forms.
|
2010-09-07 20:54:13 +00:00 |
|
rjy7
|
e4be7c255d
|
NIHVIVO-1098 Make start year optional when editing a position history, but required when adding a new position history.
|
2010-09-07 20:04:19 +00:00 |
|
rjy7
|
61059399b4
|
NIHVIVO-1022 Made organization type and label required on position history form
|
2010-09-07 16:21:13 +00:00 |
|
rjy7
|
74daa5fd58
|
Block merge of r1339 from rel-1.1-maint
|
2010-09-03 21:54:14 +00:00 |
|
rjy7
|
2a2d87006b
|
NIHVIVO-1110 Fix cancel button after validation errors on all custom form types
|
2010-09-03 21:50:27 +00:00 |
|
rjy7
|
6f2dcba70d
|
NIHVIVO-1110 Fix cancel button after undoing an autocomplete selection on grant and educational background form.
|
2010-09-03 21:34:53 +00:00 |
|
rjy7
|
62dc701913
|
Block merge of r1335 from rel-1.1.-maint
|
2010-09-03 21:27:31 +00:00 |
|
rjy7
|
1d71a7ccc6
|
Rewrote placeholder substitution mechanism in custom forms to use jquery element data.
|
2010-09-03 21:06:30 +00:00 |
|
jeb228
|
fde6fc116d
|
NIHVIVO-736 Create a Login.java controller to replace login_process.jsp.
|
2010-09-03 20:58:16 +00:00 |
|