Commit graph

6904 commits

Author SHA1 Message Date
jeb228
b07049a116 NIHVIVO-736 begin the transition from LoginFormBean to LoginStatusBean. 2010-10-06 16:06:25 +00:00
sjm222
9e1a84e174 merging in changes from NIHVIVO-1191 and NIHVIVO-1195 from the 1.1.1 branch 2010-10-05 21:35:33 +00:00
jrm424
b02bfa8191 file name correction 2010-10-05 21:11:00 +00:00
jrm424
bb22475225 java implementation of iso match 2010-10-05 21:10:00 +00:00
jrm424
683c40fddc new to make rdf for ai users 2010-10-05 21:09:26 +00:00
jrm424
7c36c8cd63 saxon9ee license 2010-10-05 21:08:29 +00:00
jrm424
535365f2cb adding enterprise edition of saxon 2010-10-05 21:08:09 +00:00
jrm424
9d6cda5b9a make geo location tags consistent 2010-10-05 21:07:30 +00:00
jrm424
26cca88844 justa test 2010-10-05 21:06:46 +00:00
jrm424
df865f5a2f new addition 2010-10-05 21:06:13 +00:00
jrm424
8b58e466d7 newly adjusted 2010-10-05 21:05:47 +00:00
jrm424
5de4905add newly adjusted 2010-10-05 21:05:25 +00:00
bjl23
9c2c22edfd fix to long-standing bug where entity counts not populated by non-filtering DAO 2010-10-05 20:44:48 +00:00
bjl23
a3472b4fe8 improvement to sesame error handling 2010-10-05 17:36:02 +00:00
sjm222
24eaf20b4b updating merge record 2010-10-05 14:54:04 +00:00
sjm222
a5f04394d9 merging update for NIHVIVO-1191 from branch 1.1.1 to trunk 2010-10-05 14:45:55 +00:00
nac26
ae449f9f2c Merge r6025 from nihvivo-rel-1.1-maint branch. Moved 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. Updated include paths for all templates that include these 3 files. 2010-10-05 03:13:14 +00:00
bjl23
c6679d1e4e merge to trunk for NIHVIVO-1182 blank node renaming URI deduping 2010-10-04 19:48:05 +00:00
bjl23
14d6dc9b70 merging basic union class support to trunk 2010-10-04 15:52:44 +00:00
rjy7
881c937594 Merge r6017 from nihvivo-rel-1.1-maint 2010-10-04 13:40:43 +00:00
rjy7
e9bff81937 Block merge of r6003 from nihvivo-rel-1.1-maint. Changes made by hand on trunk. 2010-10-01 21:05:10 +00:00
rjy7
51e294d1af NIHVIVO-1187 Migrate handling of empty or invalid query from PagedSearchController to FreemarkerPagedSearchController 2010-10-01 20:53:13 +00:00
bjl23
a3f4487a90 merging sparql query fix for using additional models into trunk 2010-10-01 19:51:23 +00:00
bjl23
e2e145954f take 2 on fixing the EntityController merge 2010-10-01 19:24:22 +00:00
bjl23
96f5c225f2 fixing erroneous EntityController commit 2010-10-01 19:03:22 +00:00
sjm222
997934d6d8 merging changes for NIHVIVO-1173 (2nd batch up updates for that issue) into the trunk 2010-10-01 18:49:29 +00:00
bjl23
4adba03c2a hand-merging revision 6005 into trunk to get around PROPFIND error 2010-10-01 18:45:42 +00:00
bjl23
183ce8eb33 merging rdf link tag addition into trunk 2010-10-01 18:37:25 +00:00
rjy7
5bc5c0b93c NIHVIVO-1176. Removed themeStylesheetDir from template model, and replaced with themeDir. Also modified stylesheet and script addFromTheme methods so the prepend only the theme directory; the specific stylesheet or css directory must be added to the path argument. 2010-10-01 14:55:03 +00:00
rjy7
535691ee11 Merge r5997 from nihvivo-rel-1.1-maint 2010-10-01 14:11:45 +00:00
rjy7
c7024c37bc Block r5991, r5994 on nihvivo-rel-1.1-maint from being merged to trunk. Same changes have been made manually on trunk. 2010-09-30 20:11:26 +00:00
rjy7
4db64bb029 Change logging level on autocomplete ParseException 2010-09-30 20:01:42 +00:00
rjy7
375f99b99a Undid previous changes related to query string cleanup, since eliminating all ParseExceptions is too involved. 2010-09-30 19:59:04 +00:00
rjy7
bf834bcac6 Merge r5988 from nihvivo-rel-1.1-maint 2010-09-30 19:20:56 +00:00
rjy7
f0ef52f6e5 Create BaseSearchController which is subclassed by AutocompleteController and FreemarkerPagedSearchController, so they can share methods. 2010-09-30 19:16:15 +00:00
jrm424
e4baea5b1f all changes in support of iso matching and modularization of rdf generators 2010-09-30 19:06:55 +00:00
rjy7
b510f53e1c Merge r5985 from nihvivo-rel-1.1-maint: query string cleanup to prevent Lucene ParseExceptions 2010-09-30 18:41:12 +00:00
rjy7
a83304b5b8 Merge r5980 from nihvivo-rel-1.1.-maint: custom sorting and collation. 2010-09-29 19:48:21 +00:00
jrm424
5bb2fe05b7 made more readable and moved common function from rdf gens to here 2010-09-29 19:27:57 +00:00
jrm424
ca296f7f6a made more readable 2010-09-29 19:26:58 +00:00
jrm424
b2a8966294 minor bug fixes 2010-09-29 19:26:12 +00:00
jrm424
42745b5980 added --clear option to reset, selectively, feedback files to t0 2010-09-29 19:25:00 +00:00
jrm424
5837a8a3b0 added --clear option to reset, selectively, feedback files to t0 2010-09-29 19:24:38 +00:00
jrm424
8386b2521d expanded capability to allow more than one group at time 2010-09-29 19:23:29 +00:00
rjy7
3975d9aa01 Merge r5968, r5972 from nihvivo-rel-1.1.-maint. Externally-linked namespaces. 2010-09-29 18:56:36 +00:00
ass92
717cbc68ce NIHVIVO-438 code modification to include export option for ontologies. 2010-09-29 14:56:37 +00:00
ass92
27d91f67c4 NIHVIVO-438 modification of code to include export feature of ontologies. 2010-09-29 14:55:45 +00:00
jrm424
e707c4ee6b cleanup, move common functions to vivofuncs.xsl 2010-09-28 20:00:38 +00:00
jrm424
0f062278be usage, param add/cleanup, upper case added to comparison 2010-09-28 19:58:59 +00:00
jrm424
1960e4b7ac usage and params cleanup 2010-09-28 19:57:49 +00:00