bdc34
|
5002c3d761
|
Removing debugging statements. NIHVIVO-1140
|
2010-10-06 21:51:57 +00:00 |
|
bdc34
|
bba244d852
|
merge 5993 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:39:05 +00:00 |
|
bdc34
|
a6fa4cd9f4
|
merge 5936 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:24:15 +00:00 |
|
bdc34
|
b943c9191b
|
merge 5932 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:21:00 +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
|
9ffdcd5322
|
merge 5929 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:07:09 +00:00 |
|
bdc34
|
37c6aca51f
|
merge 5927 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:06:36 +00:00 |
|
bdc34
|
4e89cbbd1c
|
merge 5913 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:04:10 +00:00 |
|
bdc34
|
d409271663
|
merge 5923 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:03:57 +00:00 |
|
bdc34
|
db7a8eca8b
|
merge 5926 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 21:03:19 +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
|
3480b7898a
|
merge 5407 from nihvivo-rel-1.1-maint to trunk is unnecessary
|
2010-10-06 19:31:53 +00:00 |
|
bdc34
|
af3b1db1c5
|
merge 5396 from nihvivo-rel-1.1-maint to trunk is unnecessary
|
2010-10-06 19:29:55 +00:00 |
|
bdc34
|
160fdef6e6
|
merge 5362 from nihvivo-rel-1.1-maint to trunk is unnecessary
|
2010-10-06 19:27:48 +00:00 |
|
bdc34
|
8000070c77
|
merging 5348 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 19:18:53 +00:00 |
|
bdc34
|
bcba2f22e7
|
merging 5348 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 19:18:10 +00:00 |
|
bdc34
|
bc2b73885d
|
merging 5347 from nihvivo-rel-1.1-maint to trunk
|
2010-10-06 18:58:45 +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 |
|
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 |
|