litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2243 commits 9 branches 0 tags 258 MiB
Commit graph

1141 commits

Author SHA1 Message Date
bdc34
edad16df1f merging 2932 2010-10-06 21:19:39 +00:00
bdc34
d3789eda71 Adding warning for mismatch of namespace between DB and deploy.properties. NIHVIVO-95 2010-10-06 21:19:38 +00:00
bdc34
c3cb7b05a2 Fixing page index on lucene based tabs. NIHVIVO-1143 
Conflicts:

	webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabEntitiesController.java
	webapp/web/templates/entity/entityListForTabs.jsp
 2010-10-06 20:54:29 +00:00
bdc34
a83ea26a7b Adding missing class LuceneIndexFactory.java NIHVIVO-1143 2010-10-06 20:54:27 +00:00
bdc34
f0d55d6875 merge 5911 from nihvivo-rel-1.1-maint to trunk 2010-10-06 20:02:20 +00:00
mb863
4549e8e610 2010-10-06 19:40:09 +00:00
bdc34
bcba2f22e7 merging 5348 from nihvivo-rel-1.1-maint to trunk 2010-10-06 19:18:10 +00:00
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
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
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
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
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
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
rjy7
3975d9aa01 Merge r5968, r5972 from nihvivo-rel-1.1.-maint. Externally-linked namespaces. 2010-09-29 18:56:36 +00:00
ass92
27d91f67c4 NIHVIVO-438 modification of code to include export feature of ontologies. 2010-09-29 14:55:45 +00:00
bjl23
3d897303f1 merging fix for imports loading NIHVIVO-1174 into trunk 2010-09-28 18:45:45 +00:00
rjy7
0fea772da9 Merge r5959 from nihvivo-rel-1.1-maint 2010-09-28 15:13:34 +00:00
rjy7
22cec61b5e Merge r5942-5952 from nihvivo-rel-1.1.-maint: custom sorting and collation 2010-09-28 15:02:04 +00:00
rjy7
db26e25758 Merge r5941 from nihvivo-rel-1.1-maint 2010-09-27 14:07:42 +00:00
sjm222
bbde9a3eb5 merging in updates for NIHVIVO-1157 from branch 1.1 2010-09-24 21:45:55 +00:00
rjy7
503652796c Merge r5933:5935 and r5937 from nihvivo-rel-1.1-maint 2010-09-24 21:35:03 +00:00
rjy7
715fad38f4 Merge r5930 from nihvivo-rel-1.1-maint 2010-09-24 14:01:01 +00:00
rjy7
68e5ebefc2 NIHVIVO-650 Some reorganization of template model classes. Fix for link list display on individual profile page. 2010-09-22 18:06:57 +00:00
bjl23
7931113259 merging IndividualJena overrides into trunk 2010-09-21 20:40:53 +00:00
rjy7
7b58a73c67 NIHVIVO-650: Links and image display; fixed a bug in admin panel display. 2010-09-21 19:49:43 +00:00
rjy7
e2407f7b01 NIHVIVO-650 Removed url directive from template data model, and replaced with path to the images directory. 2010-09-21 16:13:06 +00:00
rjy7
72d43f05a5 NIHVIVO-650 Display image on new (Freemarker) individual profile page. Add <@url /> directive to generate img src value. 2010-09-21 16:05:36 +00:00
rjy7
676d22b3e5 NIHVIVO-1150 Refactor ImageUploadController authorization-related methods to a separate AuthorizationHelper class so they can be used by other pages too. 
Move message in classGroups template to separate template.
 2010-09-20 16:19:04 +00:00
rjy7
c0a8d603ed Move template names to enum in FreeMarkerHttpServlet and constants in subclasses. 2010-09-20 15:40:35 +00:00
rjy7
0406db8b59 Add statusCode to ResponseValues 2010-09-17 15:11:03 +00:00
bjl23
0d93be55d4 merging avoidance of entity counts to trunk 2010-09-16 21:22:16 +00:00
bjl23
7e46f1ed02 merging picklist optimizations back into trunk 2010-09-16 19:28:34 +00:00
rjy7
d5664d93ec Some refactoring in FreemarkerHttpServlet 2010-09-16 15:50:37 +00:00
rjy7
8547665029 NIHVIVO-1149 Reintegrate dev-fmservlet branch after finishing restructuring of FreemarkerHttpServlet and subclasses. Two files had to be copied manually. 2010-09-15 21:32:32 +00:00