Commit graph

1272 commits

Author SHA1 Message Date
jeb228
172f7589c1 NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-08 19:10:44 +00:00
jeb228
c2fa36316f NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-07 20:52:57 +00:00
jeb228
659a5b41df Restructure so when you start self-editing you are no longer logged in, and when you stop you are logged in again. 2010-10-07 20:52:00 +00:00
jeb228
d6e507691a Add another debug statement; reformat. 2010-10-07 20:09:49 +00:00
jeb228
14faa42143 Merge 6096 from the branch: NIHVIVO-1199 If there is an unexpected exception in image processing, write it to the log. 2010-10-07 15:57:43 +00:00
jeb228
30344c4af9 NIHVIVO-736 transitioning from LoginFormBean to LoginStatusBean. 2010-10-07 15:11:33 +00:00
jeb228
bb07558b19 Merge 6053 from branch - Add license lines to entityListPages.jsp and LuceneIndexFactory.java 2010-10-07 13:58:41 +00:00
bdc34
b27045fe6c Fixing a lucene indexing bug when a URI of an individual is changed. NIHVIVO-1192 2010-10-06 21:52:15 +00:00
bdc34
f98b5edac5 Self editor redirect NIHVIVO-1102 2010-10-06 21:52:13 +00:00
bdc34
06f13be16d Fixing problem with collation. NIHVIVO-1190 2010-10-06 21:52:12 +00:00
bdc34
c08c2fba9b Addding paged resutls to index pages. NIHVIVO-1145 2010-10-06 21:52:10 +00:00
bdc34
23bc237950 Adding self editing of author lists, NIHVIVO-1155 2010-10-06 21:52:08 +00:00
bdc34
0cb06a1615 Attempting to fix login redirect for self editors. NIHVIVO-1102 2010-10-06 21:52:06 +00:00
bdc34
fa34bbf482 Fixing vclass editing. NIHVIVO-1172 2010-10-06 21:52:05 +00:00
bdc34
e2eb84ce73 Changing OperationUtils to use log4j 2010-10-06 21:52:03 +00:00
bdc34
b46412f71b Remove hard-coded HTTP protocol in EntityController redirect that prevents using HTTPS NIHVIVO-1169 2010-10-06 21:52:02 +00:00
bdc34
16902b929f Changing old System.out debugging messages to use Log 2010-10-06 21:52:01 +00:00
bdc34
1041759072 Changes to lucen index creation NIHVIVO-1128 2010-10-06 21:51:59 +00:00
bdc34
5002c3d761 Removing debugging statements. NIHVIVO-1140 2010-10-06 21:51:57 +00:00
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
mb863
c3ef4d3c43 2010-10-06 20:41:52 +00:00
mb863
45a4f8e690 added supersleight.js to jquery_plugins and added new pah to known_exceptions.txt 2010-10-06 20:30:20 +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
bjl23
849680d4fa button renaming for NIHVIVO-1201 2010-10-06 17:53:24 +00:00
ass92
1186b19920 NIHVIVO 1196 : Text change for radio buttons. 2010-10-06 17:41:06 +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
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
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